pull master
Merge branch 'master' of https://github.com/kelto/software-project into daniel

Conflicts:
	README.md
added test file
another test
last test
fix error
to empty repo