Merge branch 'trips_templates' of github.com:coreyd303/feed_engine_ember
adds user routes
updates users in router
Merge branch 'master' into bootstrap
adds bootstrap