Reinitialized branch
Merge branch 'master' of https://github.com/ThatSnail/vindinium_bots

Conflicts:
	diffuse