edit links
hfhf
Merge branch 'master' of https://github.com/MMITeam/Ya3bad-Project

Conflicts:
	application/views/include/header.php
	assets/images/allllli6.jpg
mj