style changes
color change
color change2
Merge branch 'master' of https://github.com/jnoble/TeamAwesome