remove dev hack
Merge branch 'master' of github.com:icco/wallpapers

Conflicts:
	app/controllers.rb
bundle update
simpler
why is it all broken