Merge branch 'master' of https://github.com/Digitalgrab/treining.git
Merge branch 'master' of https://github.com/Digitalgrab/treining

Conflicts:
	treining/CSS/StyleSheet.css
	treining/README.md
	treining/page/Mainpage.html
	treining/page/PHPPage.php
	treining/page/navigation.html
Merge branch 'master' of https://github.com/Digitalgrab/treining