Kezdeti commit
Merge branch 'master' of https://github.com/akosnagy2/Diploma

Conflicts:
	.gitignore