2 hours later, right back where i was 4 hours ago. yay
Merge branch 'develop-fei' into develop
Merge pull request #19 from binaricorn/develop

Merging in Fei's edits to homepage/css