Sun colors
Merge branch 'master' of https://github.com/chooper9/cs354r-assignment4
Final gui
Final gui changes