"changed view2 to route-planner"
Merge branch 'map'
resolved conflicts
working on maps
beginnings of the map
Work on maps.
Maps work.
rt WORKON_HOME=$HOME/.virtualenvs
map working with directions, route, directions panel, dragable directions, transportation type
fixed errors
fixed total distance
 Please enter the commit message for your changes. Lines starting
Merge branch 'map'
completed merge
app.js changed
Merge branch 'master' of https://github.com/michellelfloyd/evac-front

Conflicts:
	app/app.css
	app/app.js
	app/index.html
	bower.json
deleted view1 from app.js