Merge branch 'master' of https://github.com/chiayenhung/nyuMessage

Conflicts:
	app/css/main.css
	app/index.html
merge
Merge branch 'master' of https://github.com/chiayenhung/nyuMessage