Added marten code to database and rudimentary behavior
Merge branch 'Rob_sim' into ThreeJS

Conflicts:
	db/schema.rb