Updating ignore
Main Menu Work
Merge branch 'master' of https://github.com/jds0102/GGJ2014

Conflicts:
	.gitignore