Ignore database file
Merge branch 'master' of https://github.com/rlfriedm/HAP-APP

Conflicts:
	db/development.sqlite3