not sure what I changed
Merge branch 'master' of https://github.com/uscar/software
fixed formatting