Cleaning up main to use class methods
Merge pull request #1 from sheldrand/develop

Update index.html
cleaning up my branching mess
a commit for some reason
Merge branch 'master' into develop

Conflicts:
	bin/dbRead.py