Initial commit
Merge branch 'master' of github.com:yuruga/edisonhack
no message
Merge branch 'develop' of github-private:yuruga/edisonhack into develop

Conflicts:
	.gitignore