pulling
Merge branch 'master' of https://github.com/httpNick/Nicks-Code

Conflicts:
	temp.txt