did most of hartl tutorial for friends...;
finished hartl tutorial
pages mostly working
merged stuff for routes.db
updated css styles to make microposts look better and removed redundant user link in the feed_item.html.erb file
fixed profile edit page so that you don't need to enter a password every time you make a profile edit
merged friends model with working awesomeness.
made the formatting look right for the friend request stuff
got search function working correctly for any combination of name
added email field to search function
merged with master from github