Trying to commit
Merge branch 'master' of https://github.com/eje211/digital-dragon

Conflicts:
	dev.db