ADD: compiling version of updating. will add unit test in a bit
MERGE: Merge branch 'master' of github.com:izzycecil/Paratype
MOD: context
MERGE: context
MERGE: merge.go stuff