made everything hella beautiful
Merge branch 'master' of github.com:rstauffe/csci446team