Adding ngRoute dependency
Hooking up angular module with basic router
Resolving merge conflicts