gitignore harry's new assets
Merge branch 'master' of https://github.com/camb416/Poison_2013

Conflicts:
	.gitignore