my own attempt, trying to simplify things to my level :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.markdown