testing
nvm test later once i have somebody's android
fixed some of the colors. much easier on the eyes
Merge branch 'master' of https://github.com/Charlie-Y/CS147-project