app.js fun
Merge branch 'master' of https://github.com/irony/Narmaste

Conflicts:
	app.js