uncomment a couple tests
add reset.css
set up basic css
added wireframe for User_profile
header finished
Merge branch 'dev' of https://github.com/zpfled/schoolio into dev
merge conflicts
rageface troll