olof codemaster
Merge branch 'master' of https://github.com/ErikBjare/BikeGarage.git

Conflicts:
	README.md