gitignore
Merge branch 'master' of https://github.com/crowcasso/420_fall14

Conflicts:
	.metadata/.log
	.metadata/version.ini