upvote once only
Merge branch 'master' of github.com:kelvinw88/CrunkBox

Conflicts:
	config/environment.rb
	db/db.sqlite3