admin page work
pulled from master and fixed conflicts
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into devise_stuff
devise finally friggin working
minor conflicts
copy
copy
merge routes
merge conflicts
merge conflict
resolving merge conflict
adding to d3 js
check
fixing conflicts
updated style css
merge conflicts
Merge branch 'master' of https://github.com/whyu/wdi_project_2
merge conflict
updated line width
Merge branch 'master' of https://github.com/whyu/wdi_project_2