edit
Merge branch 'master' of https://github.com/pitosalas/pa1demo

Conflicts:
	readme.md