Added bootstrap
Adding styling
Added new graph, making views better
out of js and into controllers
Adjusting views
Resolved pull conflicts
New js and modified views