database overhaul
Merge branch 'master' of http://github.com/dv297/CodeAThon