Update style.css
Update portfolio
Update portfolio
Merge branch 'master' of https://github.com/abeMedia/abemedia.github.io

Conflicts:
	css/style.css
	js/stuff.js