Jays Working2
Merge branch 'master' of https://github.com/Parkwlsdn/MSCTutorTutiHap

Conflicts:
	application/views/sidebar.php
	static/css/view.css