some commit
Merge branch 'master' of https://github.com/delisdeli/whatitbe

Conflicts:
	app/controllers/puzzles_controller.rb
cleaned up puzzle controller