Test
Test1
OnlyGame
Standard
Standard
Create README.md
Merge remote-tracking branch 'origin/TestBranch'

Conflicts:
	.gitignore
	README.md
Merge pull request #1 from bizziel/master

testbranch to master