website stuff
Merge branch 'master' of https://github.com/alotofdavid/whos-there-2