thaydoi
thay đổi
update 5/7
index,diarycontroller
index
index
up
up
up
index,dark
Merge branch 'Son'
Merge branch 'map'

Conflicts:
	app/Controller/DiariesController.php
	app/View/Diaries/index.ctp