Merge branch 'master' of https://github.com/owen8505/MentorCliq

Conflicts:
	Development/css/styles.css
Resolved styles.css conflict