Wind
Merge branch 'master' of https://github.com/jensenwuk/RandomProject

Conflicts:
	samuel.txt