Db created with dbhelper.
Merge branch 'master' of https://github.com/djtyree/codeathon.git

Conflicts:
	src/com/tigerstripestech/codeathon/MainActivity.java