step 1
removing anything specific
Merge branch 'master' into step1
adding angular
step 2
routing
removing stuff