corrected navbar
changes to show, edit, index
updated user edit to update tweet activity and other formats
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
Merge pull request #47 from andredempsey/andre

Andre
resolved minor issues with users show/edit and links before deployment
Merge pull request #48 from andredempsey/andre

resolved minor issues with users show/edit and links before deployment
Updated slider style & performance
Dark blue buttons look nice
style changes and Ben's changes to the slider bars
style changes
added search bar to user's dashboard and changed color/style
small changes
Merge branch 'charities_search' into nicole
Merge pull request #49 from andredempsey/nicole

Nicole