added Eclipse workspace
Merge branch 'master' of https://github.com/gilhooleyd/conquest