angular seed added
Converted the data in the xl fiel to json.
Added ipython history of coverting the data to json.
Added ipython history of coverting the data to json.
Created .gitignore file.
Updated .gitignore file.
Merge branch 'development' of github.com:mrev/data-analytics into development
added a beginning bar chart to cost
Merge branch 'cost-tab' into development
Updated the Collegues.json file to fix an error.
Merge branch 'development' into router
Removed data folder from app directory.
Updated the router with routes and the controllers with the realted controllers.
Removed the svg from the index page.
Removed demo fluff from index.html. Added routes for all of the tabs. Created controllers based on the names in the router. Added data to the CapacityCtrl. Commented out the demo directives and demo filters. Added a service for the capacity data, which successfully lodas the data into the capacity.html partial.
Reformatted the new data set to json.
Updated the python scripts for formatting the data.
scaffolding style
erge branch 'development' into indexpage

Conflicts:
	app/index.html
Added highcharts and jquery. Commented out d3 and highcharts cdn link. Added div for capacity div.