Prosjektsatus
Merge branch 'master' of https://github.com/kennethfinnesand/is107-gruppe13-bteam

Conflicts:
	social/php/classes/status.php