pull request test
Merge pull request #6 from skiwi2/pull-request-test

pull request test
test newbranch push
new branch 42
ssh test
Added travis configuration file.
Merge origin/master
Added language Java to travis configuration file.
Moved travis configuration file from source to the correct root.
Added example Java main and netbeans configuration.
Lowered compatability to Java 7.
Switched from Netbeans Ant to Maven.
Fixed on start property in travis configuration file.
Forced build failure.
Changed project structure to default Maven structure.
Fixed compilable code, added failing test.
merge
merged with skiwi
Merge pull request #1 from Zomis/test42

Test42