some else changing from John
change style.css
Delete some shit
index changes
my changes
Merge remote-tracking branch 'origin/develop'