Begin using a Database in main
Merge branch 'master' of https://github.com/lavosprime/heropool

Conflicts:
	Main.cc