joelollllllllllol
Merge branch 'master' of https://github.com/Codeopolis/Ass1st

Conflicts:
	application/views/edit_profile_view.php
Merge branch 'master' of https://github.com/Codeopolis/Ass1st

Conflicts:
	application/views/pages/team_profile.php