test 4
test 5
sugh
test 6
- Added bar
2
- J
Merge branch 'dev'

Conflicts:
	java/Test/src/org/m68k/test/Foo.java