just add sth to play
just add sth
Merge branch 'play'

Conflicts:
	src/app/about/about.js