db.props
Merge branch 'master' of https://github.com/yellowtrolley/pills

Conflicts:
	pills/.gitignore
register