Apparently changed job.py
Merge branch 'master' of https://github.com/EyeOfPython/EvilTravianBot

Conflicts:
	job.py