Marcus Gosselin 91d1d34ae3 Merge remote-tracking branch 'origin/master' ... Conflicts: src/Item.java		2014-11-18 13:34:21 -05:00
..
EncryptionForm.java	new encryption form thing, to be used later	2014-11-12 23:11:34 -05:00
Item.java	Merge remote-tracking branch 'origin/master'	2014-11-18 13:34:21 -05:00
Main.java	albums, synchronous stuff, ya	2014-10-30 23:34:50 -04:00
Viewer.java	changed currentdirectory variable	2014-11-16 06:33:26 -08:00