init
Merge branch 'master' of https://github.com/fehergeri13/BudapestInfo.git

Conflicts:
	.gitignore