Merge branch 'master' of github.com:postazure/In-Class-Demo-App

Conflicts:
	README.md
This git thing