Working on stuff
Merge branch 'working_002' of github.com:emacadie/fromthepage-rails_3 into working_002
Having problems