Added annotate gem and annotated current models
Resolved conflict with Gemfile