new templating and ngRoute attempt
fixed merge conflict