change the world
Merge branch 'development' of github.com:Nyarineko/study_modern_git into development

Conflicts:
	front_src/coffee/hallo.coffee