updated router, added angular and twitter bootstrap 3 wip