Merge branch 'master' of https://github.com/wilsto/WorldCup2014

Conflicts:
	.gitignore