Merge pull request #1 from kengu2/master

light calculations from image
path modifications
Merge branch 'master' of https://github.com/vranki/pajabot

Conflicts:
	bot/pajabot.py
minor stuff