css changes to homepage
Merge branch 'master' of github.com:nycazndude/Chillax
css changes
fixed merging errors