Nothing special
Merge branch 'dev' of https://github.com/SuperHawksman/CirclesEMU.git into dev

Conflicts:
	src/pl/ijestfajnie/circles/CirclesEmulator.java
Little fixes and antfile for external jar building
Merge branch 'dev' of github.com:allhailnoah/CirclesEMU into dev

Conflicts:
	src/test.masm
Merge branch 'dev' of github.com:allhailnoah/CirclesEMU into dev
Fixed the program to do what it was supposed to do
Drivers gone interfacey, test.masm was fixed
Merge branch 'dev' of github.com:allhailnoah/CirclesEMU into dev

Conflicts:
	test.masm