added test
everything fine again
added test.java
added test2
Merge branch 'my-new-issue'
changed test.java
also changed test.java
resolved conflict in test.java
changed test.java again
(hopefully) finished the annotation loader
added .DS_Store to the gitignore files