First commit
First commit
Merge branch 'master' of https://github.com/InScreenTeam/ScreenOut

Conflicts:
	.gitignore