1.1
1.1 not
2.1
Merge pull request #14 from newhorizonsonline/2.1

2.1
Merge branch '1.1'

Conflicts:
	README.md
	README.md~
Delete README.md
Delete README.md~
readme file
Merge branch 'master' of https://github.com/newhorizonsonline/NewHorizons

Conflicts:
	README.md~
1.1