home page styling
Merge branch 'master' into marcus
removed dead code, parallax
Merge branch 'master' into marcus
Reduced Size of Images in Photoshop to Reduce Page Load Time
Merge pull request #78 from ltfschoen/4apr_plan_c

Reduced Size of Images in Photoshop to Reduce Page Load Time
home page, pages.css, deleted dead code, removed relative, added js to hide heading
fixed conflicts for merge
Merge branch 'master' of https://github.com/epoch/codium

m master
:wq
Merge branch 'master' into samsam
Update README.rdoc
Merge pull request #79 from sammyjopeters/samsam

User Profile fixes, Project index fixes + other stuff
Merge branch 'master' into samsam
reinstated commented-out code for student pages