Merge branch 'master' of https://github.com/janisz/bikeday

Conflicts:
	index.html
	js/main.js
	src/css/main.css
Repo url changed to FM