Started who-what controller
Who-What controller started merge resolved
Merge branch 'master' of github.com:michellelfloyd/evac-front
Merge branch 'master' into whowhatcontroller
Merge branch 'master' into develop

Conflicts:
	app/app.js
	app/index.html
Merge branch 'whowhatcontroller' into develop
Merge branch 'develop' of github.com:michellelfloyd/evac-front into develop
Fixing merge conflicts
Merge branch 'master' of github.com:michellelfloyd/evac-front

Conflicts:
	app/app.js
	app/index.html
reinstalled restangular, fixed routes in index
got rid of extra text on the index
added restangular to bower
Merge branch 'who-what'
Changed some styling on the navbar
Merge branch 'who-what'
Created an addWaypoint function in the controller
Made models function in destinations
Merge branch 'destcontroller' into develop
Fixed merge conflicts from develop
Merge branch 'master' into develop