init
Merge branch 'master' of https://github.com/cosysn/toding

Conflicts:
	src/app/views/index.html