Joe is stupid and can't function properly without energy drinks. Closes #112
Began working on the editTranscription API
Fixed merge conflicts