new day, new commit
github debug
Merge branch 'master' of https://github.com/andreasjacobsen93/AirplaneBooking

Conflicts:
	AirplaneBooking/src/airplanebooking/AirplaneBooking.java
	AirplaneBooking/src/airplanebooking/swing/AirplaneCanvas.java
	AirplaneBooking/src/airplanebooking/swing/SwingMain.java