laslal
Merge branch 'master' of https://github.com/yusukejoan12/aulanet

Conflicts:
	application/controllers/course.php