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'
Made models function in destinations
Merge branch 'destcontroller' into develop
Fixed merge conflicts from develop
Merge branch 'master' into develop