fixed
Merge branch 'master' of https://github.com/jrec15/DawgDashDeliveries
merge from david
merge from david2