Hate my Life
Merge branch 'master' of https://github.com/studybuddyuf/studybuddy

Conflicts:
	django/studybuddy/searchPage/templates/searchResult.html~
Merge branch 'master' of https://github.com/studybuddyuf/studybuddy
Merge branch 'master' of https://github.com/studybuddyuf/studybuddy
Merge branch 'master' of https://github.com/studybuddyuf/studybuddy
Fix the search results to not allow the user to send friend request when nothing was selected
Fixed search results page by not allowing the user to send request when nothing is highlighted