changes
Merge branch 'master' of https://github.com/rohitverma007/angelhack2014

Conflicts:
	www/js/app.js
links updated
added files