sun is a sun
Merge branch 'master' of github.com:Anstow/TeamAwesome
Merge branch 'master' of github.com:Anstow/TeamAwesome
minor things