chinh file contact
test master
test master
sua xong ham students_courses/attended
xong giao dien sinh vien
test master
Merge origin/master
	.editorconfig
	.travis.yml
	app/Plugin/Authorize/.travis.yml
	app/Plugin/BoostCake/.travis.yml
	app/Plugin/DebugKit/.jshintrc
	app/Plugin/DebugKit/.travis.yml
	nbproject/private/
	new file:   .editorconfig
	new file:   .travis.yml
	new file:   app/Plugin/Authorize/.travis.yml
	new file:   app/Plugin/BoostCake/.travis.yml
	new file:   app/Plugin/DebugKit/.jshintrc
	new file:   app/Plugin/DebugKit/.travis.yml
	new file:   nbproject/private/private.properties
	new file:   nbproject/private/private.xml
Merge branch 'Toan'

Conflicts:
	app/Controller/AppController.php
	app/Controller/ContactsController.php
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
	modified:   app/Controller/AppController.php
	modified:   app/Controller/ContactsController.php
	modified:   app/Controller/CoursesController.php
	modified:   app/Controller/StudentsCoursesController.php
Merge branch 'Khoa'