removing a random dir new.html.haml
merging master into models
adding the tags link
Merge branch 'models'
merging models into master