git ignore
Merge branch 'develop' of github.com:blaavogn/bdsa into develop
Merge branch 'develop' of github.com:blaavogn/bdsa into develop
Almost picture upload
Add car is pretty much working
Merge conflict