Added User class and basic user view page
Added user view for pending friend request
Bryant's take_quiz changes made
stuff
implemented history function for quizzes
Fixed Create Quiz to get user from session
getting show_quiz working
show quiz description page finished
added time stuff.  done.  about to merge master
Merge pull request #27 from kmblake/Quiz-edits-Eric

Quiz edits eric
Working on search
Search fully functional
Merge branch 'master' into user-features

Conflicts:
	Quiz Website/WebContent/show_quiz.jsp
Added getUsername() method to user, edited show_quiz
Merge pull request #28 from kmblake/user-features

User features
Basic notes working
Notes is working
Conversation View is working
Fixed create_account to set user object in session
Friend Request working