Edit content on all pages
Merge branch 'master' of https://github.com/krispy-krunch/Portfolio

Conflicts:
	css/main_style.css
	main.html

Merge