Merge pull request #5 from jackdreilly/master

different headers
Added structure of demo3
Demo3 mainly done
Corrected demo 3, backend for showing control
merged seb
fixes from merging