Edit 2
Merge branch 'master' of github.com:albertoblaz/ProjectCS13Demo

Conflicts:
	README.md