Added solution and gitIgnore
Merge branch 'master' of github.com:San4ezSoft/Master-s-thesis

Conflicts:
	.gitignore
Change port to 57367