init done in work
Merge branch 'master' of https://github.com/nenros/100km-frontend

Conflicts:
	.gitignore
	README.md