committing my changes
Merge branch 'master' of https://github.com/zen6/Fugue

Conflicts:
	src/Main.java