lots of styling
Merge branch 'master' of github.com:aldhsu/TeamDNM