Merge pull request #2 from SvenssonWeb/master

I rulez
I rulez
First commit
Emil testar
Plane and User
I Rulez More
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Main.java
This time It'll work
Merge pull request #3 from Magragosh/master

Classes (Fredrik Svensson)
window
Merge pull request #4 from hilda-r/master

window
DbFactory part 1
Merge pull request #5 from svenne87/master

DbFactory part 1
DbFactory part 2
Merge pull request #6 from svenne87/master

DbFactory part 2
test

Added test string in Flight
Merge branch 'master' of https://github.com/Hewgouw/FlyAlmhult
Fixed classes using classes instead of id's
Route using airports instead of citys
window - flight routes