ordering stuff
Merge branch 'master' of https://github.com/twschum/project3