Changed some colors around
Merge branch 'Spoon'
Merge branch 'master' of https://github.com/cswen17/hackplus
Fixed some alignment issues
Merge branch 'master' of https://github.com/cswen17/hackplus
Alignment issues