Initial commit
Added new file
Created test.html
Merge branch 'master' of https://github.com/awesome-sauce/repo2

Conflicts:
	.gitignore