add .gitignore
Merge branch 'develop' of github.com:yuruga/edisonhack into develop