corrected navbar
changes to show, edit, index
resolving merge conflicts
resolving merges
Merge branch 'master' of github.com:andredempsey/tweets4charity

Conflicts:
	app/views/users/show.blade.php
Merge branch 'master' into nicole
Merge pull request #46 from andredempsey/nicole

Nicole