updates
Merge branch 'master' of https://github.com/bigwheels16/AOClojureBot

Conflicts:
	.gitignore
	pom.xml