my commit
my commit
fix tags_controller
clean up commit
Merge pull request #1 from griffithac/master

Merged