added ng-route
Merge branch 'master' of https://github.com/prkr88/utsid14

Conflicts:
	gulpfile.js