1.1
Merge branch 'master' of https://github.com/newhorizonsonline/NewHorizons

Conflicts:
	README.md