Merge branch 'master' of https://github.com/Mingyi-kooboo/momento

Conflicts:
	assets/app.css