No real changes
Merge branch 'master' of https://github.com/studybuddyuf/studybuddy

Conflicts:
	django/studybuddy/searchPage/views.py
The user interfacce for Search.
	The structure for the interface is implemented.
	Highlight is selecting which user to send a request too.
Merge branch 'master' of https://github.com/studybuddyuf/studybuddy