init
git ignore.
Merge branch 'master' of github.com:romeod75/PrjJellyBowlWeb

Conflicts:
	.gitignore
gitignore file
Facebook sign-up and maven changes.