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
check
merge conflicts
Merge branch 'master' of https://github.com/whyu/wdi_project_2
merge conflict