lucia's commit 2
Merge branch 'master' of https://github.com/dusgml92/ChristineLucia

Conflicts:
	README