Random edits, still can't get error to dissapear
committing .xccheckout change
merging with dev
fixing merge conflict
Merge branch 'Vala' of https://github.com/Valak12/CityBicycleCompanySecond into Vala
creating new branch
Merge branch 'dev2' of https://github.com/Valak12/CityBicycleCompanySecond into dev2
Did work