still working
Merge branch 'master' of github.com:bayleefeore/final_project into more_bugz
found the one line of css causing all the trouble -_-
Merge branch 'more_bugz'