Saving local changes
Fixed merge conflicts
Added annotate gem
Merge pull request #6 from azntango/dog