rearrange some stuff
Merge branch 'Cameron' of https://github.com/tchordia/teamdhc2 into Cameron