Gitignore added
Merge branch 'master' of github.com:em-mo/bearded-butt-kick

Conflicts:
	.gitignore