last commit.
Merge branch 'master' of https://github.com/danielhaim1/Proverb

Conflicts:
	Proverb.css