Attempting
Merge remote-tracking branch 'origin/master'

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