Added CMakeLists.txt.user to .gitignore
Merge branch 'master' of https://github.com/Dominik2000/AirportManager

Conflicts:
	CMakeLists.txt.user