More emocial!!!
Modified greetings to welcome
Merge branch 'master' of github.com:andreishubnik/SeaFightBackend

Conflicts:
	README.md
added .idea to .gitignore
Merge remote-tracking branch 'origin/master'
Merge branch 'ailjushkin'

Conflicts:
	.gitignore