Fix schema
Merge branch 'master' of github.com:RailsWeek2014/Rubylator

Conflicts:
	db/schema.rb