Merge branch 'master' into Jacob
Merge branch 'master' into Jacob
Merge branch 'master' into Jacob
Merge branch 'master' into Jacob
Merge pull request #36 from TAwesome/jill

Jill
Fixed the user object in the photo actions in Users controller
Basic tagging work. Worked show blade. Fixed following blade.
Initial work on google api
Merge pull request #37 from TAwesome/Jacob

Jacob