Alright, half of that didn't commit last time. This should do it. Also merged the master into this branch so we have the latest README.
Alright, half of that didn't commit last time. This should do it. Also merged the master into this branch so we have the latest README.

1fish2/the-blue-alliance-android,nwalters512/the-blue-alliance-android,phil-lopreiato/the-blue-alliance-android,the-blue-alliance/the-blue-alliance-android,nwalters512/the-blue-alliance-android,Zero2848/the-blue-alliance-android,phil-lopreiato/the-blue-alliance-android,the-blue-alliance/the-blue-alliance-android,Adam8234/the-blue-alliance-android,the-blue-alliance/the-blue-alliance-android,1fish2/the-blue-alliance-android,nwalters512/the-blue-alliance-android,phil-lopreiato/the-blue-alliance-android,Zero2848/the-blue-alliance-android,1fish2/the-blue-alliance-android,Adam8234/the-blue-alliance-android