how about this
Merge branch 'master' of https://github.com/mraplus/mraplus.github.io

Conflicts:
	style.css