cleaning up
re cleaned up
Merge branch 'master' of https://github.com/zapree/superawesomewebsite
what
final for now