some formatting stuff
merges
murging Ashleys fix
Merge branch 'ashleyjihye2-master2'
a
adding artwork and formatting stuff
murging our amazing artwork
Merge branch 'clc2-master2'