Conflict
Merge branch 'master' of github.com:heroic/git-training

Conflicts:
	gurpreet.txt