Merge remote-tracking branch 'upstream/master'
Make models extend observable
Fix typo
Initial port to maven
Add org.json dependency
Dont have an array as root element in our json
I LIKE TURTLES
Merge remote-tracking branch 'upstream/master'
Merge branch 'maven'

Conflicts:
	Matador/src/Res/Fields.json
	Matador/src/matador/Matador.java
	Matador/src/matador/Turn.java
Merge pull request #10 from dotted/master

Import maven