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