Merge branch 'master' of https://github.com/annesleycuttle/hello-world.git into Tester-Branch-AC-10/09/14
Added Hi comment to see if it would work
Testing committing
Committing everything
Merge branch 'Tester-Branch-AC-10/09/14'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/annesleycuttle/hello-world