Hello?
Merge branch 'master' of https://github.com/kaledj/MikeSweeper

Conflicts:
	.gitignore