update
Merge branch 'master' of https://github.com/tonysh518/garnier

Conflicts:
	js/app.js