removed last line in MergeConflicts
Merge branch 'master' of https://github.com/colestew/apt14-tcs