Merge branch 'master' of https://github.com/moshecarmeli/SoccerDaddy

Conflicts:
	.gitignore
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   .gitignore
#	new file:   README.md
#
# Untracked files:
#	.idea/libraries/
#