updates on 112
updates on 112
Merge branch 'master' of github.com:dipak23b/DemoRepo

Conflicts:
	1403.txt
	index.html
deleted files
Update controllers.js
Update directives.js
Merge commit 'ce8a3ddc63765dd7d3c907bb489cf9439fc66b7b' into futureBranch2014
Merge remote-tracking branch 'origin/master' into futureBranch2014