Created an addWaypoint function in the controller
Got waypoints working
Merge branch 'waypoints'
Styling changes, mostly to the navbar
Merge branch 'master' of https://github.com/michellelfloyd/evac-front
Merge branch 'master' of github.com:michellelfloyd/evac-front

Conflicts:
	app/index.html
Merge branch 'master' of github.com:michellelfloyd/evac-front
Added delete waypoint functionality
Merge branch 'waypoints'
Got a custom bank button calling a function - not the function we want, but a function
Merge with conflicts resolved
Merge branch 'master' into develop