Created the empty Database
the user scaffold
Sample Commit
Merge remote-tracking branch 'chibz/master'

Conflicts:
	config/routes.rb