Merge branch 'master' into whowhatcontroller
revisions to destination plan
Merge branch 'master' of github.com:michellelfloyd/evac-front

Conflicts:
	app/app.js
	app/index.html
Merge branch 'master' into develop
changes to the destination html page and app.js file
added restangularprovider to app.js
Added route for who-what and for destination. Also added a baseurl, and removed the view2 app from the list of apps
Add bluebird
added restangular to the list of apps in app.js
Added restangular include.
Included restangular in the bower.json file
Added restangular to index.
Merge branch 'develop' of github.com:michellelfloyd/evac-front into develop
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
Made models function in destinations
Merge branch 'destcontroller' into develop
Fixed merge conflicts from develop