adding git ignore
Merge https://github.com/sljuka/magacin-bachlore

Conflicts:
	.gitignore
modified readme
added the project
modified readme again
Merge branch 'importingProject'