added index.html
Specifying doctype
Merge branch 'master' of https://github.com/NicePixel/testRepo

Conflicts:
	index.html
Merge https://github.com/NicePixel/testRepo
Added .gitignore