Resolving issues within git
Merge branch 'master' of https://github.com/jalau/GRP22_18649

Conflicts:
	portfolio_template/logs/improvements.html