Fixed gitignore file
Merge branch 'master' of https://github.com/ObivouseCheste/craftbot
Merge branch 'master' of https://github.com/ObivouseCheste/craftbot

Conflicts:
	.gitignore