Wrote makefile function of drawingIO library
wrote some functions
Added working functions
Merge branch 'alice' into michelle
Receive drawingIO library
Fixed trajectory equations