Kevin's commit
Merge branch 'master' of https://github.com/spooked/maero

Conflicts:
	src/DBConnection.java