Merge branch 'master' into jill
Merge branch 'master' into Jacob
created if statement to check if user is logged in or not
Merge branch 'master' into jill
Merge branch 'master' into Jacob
working on showing all posts
Merge branch 'master' into jill
Merge pull request #33 from TAwesome/rissa

Rissa
Merge branch 'master' into Jacob
Merge pull request #34 from TAwesome/rissa

Rissa
Merge branch 'master' into Jacob
Merge branch 'master' into jill

Conflicts:
	app/views/TAhome.blade.php
Merge branch 'master' into jill

Conflicts:
	app/views/TAhome.blade.php
Fixed routes so now when you comment or make a post on the home page it stays on that page
Now the profile button works
fixed the routing so the url routing is more intuitive
sending more variables
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.