case study
Merge branch 'master' of https://github.com/osei95/benfolio

Conflicts:
	www/css/style.css