got rid of unecessary files and updated .gitignore
Merge pull request #27 from ZackAlfakir/master

got rid of unecessary files and updated .gitignore
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	Controller.h
update