Initial commit
App init
Merge branch 'master' of github.com:kyokutyo/20131217 into feature/app-init

Conflicts:
	.gitignore
Merge pull request #1 from kyokutyo/feature/app-init

App init
Merge branch 'develop' of github.com:kyokutyo/20131217 into develop
Merge branch 'release/0.1.0'