new changes
Merge branch 'master' of https://github.com/bijenderk82/sample

Conflicts:
	app/scripts/controllers/main.js