Made this file executable
Merge branch 'master' of https://github.com/EyeOfPython/EvilTravianBot
Merge branch 'master' of https://github.com/EyeOfPython/EvilTravianBot

Conflicts:
	web_server.py
Merge branch 'master' of https://github.com/EyeOfPython/EvilTravianBot
Merge branch 'master' of https://github.com/EyeOfPython/EvilTravianBot
Merge branch 'master' of https://github.com/EyeOfPython/EvilTravianBot
Merge branch 'master' of https://github.com/EyeOfPython/EvilTravianBot
Pre-merge
Merge branch 'master' of https://github.com/EyeOfPython/EvilTravianBot
Merge branch 'master' of https://github.com/EyeOfPython/EvilTravianBot
Merge branch 'master' of https://github.com/EyeOfPython/EvilTravianBot
Merge branch 'master' of https://github.com/EyeOfPython/EvilTravianBot