First commit
Emil testar
Merge pull request #1 from svenne87/master

Test Test
I rulez
Merge pull request #2 from SvenssonWeb/master

I rulez
Plane and User
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Main.java