added music, starting GUI work
Merge branch 'master' of https://github.com/robz/CS354R-Project2

Conflicts:
	Assignment2.h