init
ruby2.0 rails 4.0.0
rails 4, ruby 2
Merge branch 'creation_vote'

Conflicts:
	app/models/.DS_Store