ignore
Merge branch 'master' of https://github.com/PerlaYap/project

Conflicts:
	application/views/navigation.php