Merge branch 'master' of https://github.com/Injaysen/NewBiker

Conflicts:
	.gitignore
+