Created project!
Merge remote-tracking branch 'origin/master' into local branch 'master'

Conflicts:
	.gitignore
	pom.xml
	src/main/java/com/gmail/inverseconduit/JavaBot.java