Merge branch 'master' of https://github.com/mohitagarwal/mobile-hackathon

Conflicts:
	mobile-hackday/www/index.html
	mobile-hackday/www/js/app.js