state machine implemented
Merge branch 'master' into state_machine

Conflicts:
	db/schema.rb
Merge branch 'master' of github.com:MarshallMcCoy/rate_anything