Merge branch 'DavidS-master'

* DavidS-master:
  Add geppetto project file

closes #23