First commit
Merge branch 'master' of github.com:pitosalas/pa1demo

Conflicts:
	readme.md
Take two
Merge branch 'master' of github.com:pitosalas/pa1demo

Conflicts:
	readme.md
First commit
Merged
Merge branch 'master' of github.com:pitosalas/pa1demo