Changed to fancy speaking instead of just using print
Merge branch 'master' of https://github.com/Hollyzorx/TestingGit into second_branch

Conflicts:
	helloworld.py
fixed everything to incorporate master stuff