init
Merge branch 'master' of github.com:mwisner/flyingfrogs_endis