instructions and stats
Merge branch 'master' of https://github.com/tinazheng/teluxe

Conflicts:
	app/app.js