banana
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/main/Database.class
	bin/main/ShadyBotty.class
	src/main/Database.java
	src/main/ShadyBotty.java