Minor updates to structure
add include
Merge remote-tracking branch 'origin/David' into Sherry
add draw line and circle files