some more updates
Merge branch 'master' of https://github.com/ruxandrabarz/gitPractices

Conflicts:
	gitPractices.txt