Fixed merge conflicts
Merge pull request #2 from buren/f1

F1
Merge pull request #2 from buren/f1

F1
Merge pull request #3 from buren/sluttest

Made changes
Merge pull request #3 from buren/sluttest

Made changes
Merge pull request #4 from buren/buren

Update
Fixed merge conflicts
Fixed merge conflicts
Fixed merge conflicts
Merge pull request #5 from buren/max

testet
Merge pull request #5 from buren/max

testet
Merge pull request #5 from buren/max

testet
Merge pull request #5 from buren/max

testet
Test java project with Junit 4
Test java project with Junit 4
Test java project with Junit 4
Test java project with Junit 4
Merge branch 'master' of github.com:buren/test into max

Merge.
Merge branch 'master' of github.com:buren/test into max

Merge.
Merge branch 'master' of github.com:buren/test into max

Merge.