scaffolds
Merge branch 'master' of https://github.com/Ukiebook/ukiebook

Conflicts:
	db/schema.rb