some prettifying
fix merge conflicts in application.html
cleaned up stupid things
let's merge stuff
Merge branch 'master' of github.com:katiespiders/far_mar_rails