Merge branch 'master' into develop
Working on Bank Button
add person page functionalish
Merge branch 'addperson' into develop
styling and functionality changes on Add-PErson view
Merge branch 'who-what' into develop

Conflicts:
	app/add-person/add-person.html
	app/add-person/add-person.js
Small changes
committed bank button changes
Merge branch 'bankbutton' into develop
Merge branch 'develop' of https://github.com/michellelfloyd/evac-front into develop
Got bank Button working based on map center
Got Add Button in InfoWindow
Made it possible to add bank locations to way points
Add pets checkboxes working
Merge branch 'waypoints' into develop
Merged
Merge branch 'develop' of github.com:michellelfloyd/evac-front into develop
route-planner.js changes
Merge branch 'develop'