Second commit
Merge branch 'david' of https://github.com/dsieberger/CP into david

Conflicts:
	README.md
test commit
aula1 upload
merge aula1