restore some html, remove footer
Merge branches 'UiBuildingSelect' and 'master' of https://github.com/mbeck5/GU_Energy_Dashboard into UiBuildingSelect

Conflicts:
	client/app/views/buildingSelector.html
put back the css stuff
Revert "Merge branches 'UiBuildingSelect' and 'master' of https://github.com/mbeck5/GU_Energy_Dashboard into UiBuildingSelect"

This reverts commit 94d5a33ce06a91c5629aec266e57fc5576cee716, reversing
changes made to e63aa738eb628ab7779188f24c70a30880324cb0.
put the image back
adding new ui design
Merge branch 'master' of https://github.com/mbeck5/GU_Energy_Dashboard

Conflicts:
	client/app/scripts/controllers/buildingSelector.js
	client/app/styles/buildingSelector.scss
	client/app/styles/main.scss
	client/app/views/buildingSelector.html
got version control sorted out
Merge remote-tracking branch 'origin/UiBuildingSelect' into UiBuildingSelect

Conflicts:
	client/app/styles/buildingSelector.scss
	client/app/views/buildingSelector.html
horizontal tabs
horizontal tabs
horizontal tabs work
Merge branches 'UiBuildingSelect' and 'master' of https://github.com/mbeck5/GU_Energy_Dashboard into UiBuildingSelect

Conflicts:
	client/app/index.html
Merge branches 'UiBuildingSelect' and 'master' of https://github.com/mbeck5/GU_Energy_Dashboard into UiBuildingSelect

Conflicts:
	client/app/index.html
tips work
Merge remote-tracking branch 'origin/UiBuildingSelect' into UiBuildingSelect
tips work
removed pictures
removed pictures
tips work