2 new scaffold
2 new scaffold
Merge branch 'master' of https://github.com/Evrei/demo_app

Conflicts:
	README.md