init commit
Merge branch 'master' of https://github.com/akirakazu/shiny-bear

Conflicts:
	index.js