Updated gitignore
Merge branch 'dev' of https://github.com/LawrenceJones/LiveHack into dev

Conflicts:
	.gitignore