change views
Merge pull request #9 from BillytheMagicToilet/Spencer

Spencer
some stuff
Merge remote-tracking branch 'origin/Jack' into Spencer

* origin/Jack:
  some stuff
  change views

Conflicts:
	db/schema.rb
Fixed migration overlapping.
Writing factories.