added 2 aktivities
Merge branch 'master' of https://github.com/Temestokles/gruppeweb

Conflicts:
	aktiviteter.php
added 2 things