initial import
Merge branch 'master' of github.com:kenoir/dancing_with_oysters