changed main and added menustate
Merge branch 'master' of https://github.com/sw11/CSE481d

Conflicts:
	TrashIt.as3proj