added main callback
added main startup file
Set executable bit for main.py
Merge branch 'master' of github.com:shackspace/tribot
Merge branch 'master' of github.com:shackspace/tribot
Merge branch 'master' of github.com:shackspace/tribot
changed host name
Merge branch 'master' of github.com:shackspace/tribot

Conflicts:
	triweb.py
connected everything