a change
add abouts
Merge branch 'master' of https://github.com/smial/smial

Conflicts:
	cloud/app.js