changing dir hierarchy, amended
Merge branch 'master' of github.com:Ascariel/Rails_Tutorial

Conflicts:
	demo_appSCF