is eddie here?
Merge branch 'master' of github.com:danbeam/iseddiehere