Merge branch 'master' of https://github.com/ewelaryba/Makapen-

Conflicts:
	images/portfolio01.jpg