.gitignore needs to be in. it's the list of files git should not try to check in
Merge branch 'master' of https://github.com/lfrankel/GGJ2014

Conflicts:
	.gitignore
Moved to a new folder, so stuff outside unity project can be added