create new entities
Merge branch 'master' of github.com:Namluu/s_demo

Conflicts:
	.gitignore