project as it was at time of demo
merge demo with master