Pull in changes from gamestarter
Merge branch 'master' of github.com:deadzed/deadzed

Conflicts:
	.gitignore
	gulpfile.js