install nvd3-directive, switch to angular-compatible bootstrap
Merge pull request #7 from mbeck5/new-components

new components
make readme really pretty
make readme even more pretty
make readme super duper pretty
readme
Merge pull request #8 from mbeck5/new-components

Readme enhancements
Added methods to get each resource type given a building.  This is in site.js.
Added single method to get all resources
don't break grunt
retrieve building data from backend
Fixed queries to get resources.
Merge pull request #9 from mbeck5/Get-And-Graph-Resource

Get resources
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