Commit before pulling from github
fixed merge conflict
Merge branch 'master' of https://github.com/gleixner/Java2