initial population
Merge branch 'master' of github.com:uat-csc413/cake-demo

Conflicts:
	README.md