Changes to FileManager and Main
Merge branch 'master' of https://github.com/bobsbeard1/puzzles.git

Conflicts:
	src/Control/Main.java
Merge branch 'master' of https://github.com/bobsbeard1/puzzles.git