making a conflict
Merge branch 'master' of https://github.com/megaton21/lolccats

Conflicts:
	Docs/git.txt