it compiles at last
Merge branch 'master' of github.com:sushiowns/cloudcomp1

blah