Adding angular routing
merge