corrected navbar
Merge pull request #43 from andredempsey/andre

updated charities.index to show all charities paginated by 9 per page; u...
Merge pull request #44 from andredempsey/andre

small formatting changes to donor public profile
made changes to index view(home) added pics and names
made changes to index users(show) wording in "charities"
added 3 temp headshots to img files
changes to show, edit, index
Merge pull request #45 from andredempsey/andrew

made changes to index view(home) added pics and names
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
resolve merge conflict in UsersController edit method