Terminal file added to project
Merge branch 'master' of https://github.com/JacksonGariety/Brains-with-Friends

Conflicts:
	client/scripts/views/npc.coffee