removing unneeded stuff
Merge branch 'master' of /Users/thomashentschel/git/hottub