commented out ruby weirdness in new.html.erb
merging stuff
Merge branch 'master' of https://github.com/katke/farmar-rails
added RESTful routes