readying for merge
our project is AWEESOOMMEEE
Merge branch 'bigapps' of https://github.com/h55nick/project3 into bigapps
figuring out the sorting issues