now fixed! Phew!
Merge branch 'master' of https://github.com/audunthecyborg/audunio

Conflicts:
	views/portfolio.jade