Merge branch 'master' of https://github.com/tsantakismanos/ICeePot

Conflicts:
	documentation/notes/git.odt
tsantakismanos: files removed