Deleted main for test
Merge commit '2eb322387ab83dda4a9fcc239666ea168d6b4f29'

Conflicts:
	src/music/Musha.java (didn't adam fix this?)