Commiting db.development.sqlite3 and db/schema.rb so that I can pull the latest files from the master branch
Merge branch 'master' of https://github.com/ofer987/Numerous

Conflicts:
	db/development.sqlite3
	db/schema.rb
Merge branch 'master' of https://github.com/ofer987/Numerous

Conflicts:
	db/development.sqlite3
	db/schema.rb