edit
Merge branch 'master' of github.com:joshuamartin/joshbot7_core

Conflicts:
	joshbot7_core.info