Merge remote-tracking branch 'origin/GUI' into Display-AddFunction-Dev
Added main app

added main app. Also added some fuctionality to CShirt
Redundant commit for switching branches over
stitched together some parts

Put together the actioncontainer, datacontainer, and voice command into
CWSApp
Merge remote-tracking branch 'origin/Display-AddFunction-Dev' into Display-Amy-Dev