style cleanup
Merge branch 'master' of https://github.com/dereklmc/css432
Merge branch 'master' of https://github.com/dereklmc/css432