Pull Test 2

Pull test - ignore changes
Merge branch 'master' of https://github.com/TKRKS/CyclingHelper

Conflicts:
	.gitignore