committing so I can pull

nothing changed
Merge branch 'master' of https://github.com/charliebear/EECS370

Conflicts:
	bin-debug/Main.swf