Castle and Gate updates
Merge branch 'master' of https://github.com/egleiser/DemonParasol
milestone 2 presentation

segment presentation powerpoint
Merge branch 'master' into Segment_Jason