rmv annotation
Merge branch 'master' of https://github.com/railsgirlsnola/railsgirls_nola