Git ignore
Merge branch 'master' of https://github.com/TeAche/autobot

Conflicts:
	.gitignore