Forgot an end in welcome_controller.rb
Merge branch 'dev' of github.com:magikid/schedule_beeminder into dev