Java - Moved files around and made it load every file from the files directory rather than just one
Merge remote-tracking branch 'origin/master'