Commit app.js changes
Merge branch 'master' of github.com:samatjain/milkshake
Merge branch 'master' of github.com:samatjain/milkshake

Conflicts:
	app.js
Merge branch 'master' of github.com:samatjain/milkshake
Port issue again grrr
Merge branch 'master' of github.com:samatjain/milkshake