Removed .classpath from commit. Had to do a commit.
cached .classpath
Merge branch 'master' of github.com:Wilhelmws/Progsik2013