new database, here we go
Merge branch 'master' of https://github.com/bransby/dotsonransby.git

Conflicts:
	src/com/example/digplay/GameplanManagerActivity.java