Add folders to gitignore
Merge branch 'master' of https://github.com/bmalmh/02267-AirlineReservation

Conflicts:
	.gitignore
Remove private properties file