Add git cola
Decrease redundancy
Merge remote-tracking branch 'origin/master'

Conflicts:
	git-cheat-sheet.pdf
	git-cheat-sheet.rst

Conflicts resolved.