Updated Project2 (beta)
preparing to merge with master
Merge branch 'Beta'

Conflicts:
	bin/Project2.class
	bin/UserSettings.class
	src/Project2.java