Initial commit
Merge branch 'master' of github.com:codeortest/temp

Conflicts:
	.gitignore