Poop txt file
fixed merge conflicts because
Merge branch 'master' of https://github.com/aedwardsxula/xucs_cpsc_2740