Resolve merge conflict
New database file
Keyboard shortcuts

“1” for Moo, “2” for Quack
Still needs some work
(sync to fix)
Merge branch 'master' of https://github.com/guyemerson/pyphon

Conflicts:
	src/wxGUI.py