Simon changed
Simon changed
com
Revert "Simon changed"

This reverts commit fc8a085c302766ff335eeb722e54cf7b3bdd1fe5.

Conflicts:
	app/routes.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/routes.php
Merge branch 'master' of https://github.com/nguyenhieptn/hellogit