Test merger
Merge remote-tracking branch 'origin/master'

Change-Id: I68a6b294c970a7cab4da9f97803155fc5454f7cf
Signed-off-by: Tobias <pahlings@gmail.com>
Merge branch 'master' of https://github.com/topahl/uniJava.git