Initial commit
Stuff!
Merge branch 'master' of github.com:Diamond/NewUnityProject

Conflicts:
	.gitignore