dropdown links
Merge branch 'master' of https://github.com/marcni13/projekt_dynamiska

Conflicts:
	portfolio.php
	profilepage.php
Merge branch 'master' of https://github.com/marcni13/projekt_dynamiska