Commit Khoa branch
Commit Khoa branch
chinh file contact
sua file readme
Merge origin/Khoa into Khoa
sua file appcontroller
Merge branch 'Khoa'

Conflicts:
	app/Controller/ContactsController.php
	app/Controller/CoursesController.php
	app/Controller/StudentsCoursesController.php

	modified:   app/Controller/AppController.php
	modified:   app/Controller/ContactsController.php
	modified:   app/Controller/CoursesController.php
	modified:   app/Controller/StudentsCoursesController.php
	modified:   app/View/Dashboards/student_home.ctp
	modified:   app/View/Elements/Common/new_course.ctp
	new file:   app/webroot/files/chapter/image/7/Penguins.jpg