Pythonified mergeConflict exercise

Updated go.sh to reset through unmerged paths
Updated createPushNewFile exercise

Promoted precedence of having wrong file over having wrong msg
Colorized terminal output
Increased time limit