portfolio w. carousel
Merge branch 'master' of https://github.com/ahmedk9/Team-4-dev

Conflicts:
	portfolio.html
Merge branch 'master' of https://github.com/ahmedk9/Team-4-dev