Merge branch 'master' of https://github.com/garrapeta/PingPong

Conflicts:
	.gitignore