added the .settings/* to gitignore for eclipse settings to be ignored
Merge branch 'master' of https://github.com/msa3600/HungryBubbles

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/msa3600/HungryBubbles
Merge branch 'master' of https://github.com/msa3600/HungryBubbles