Comitter det som mangler i git if. ftp
Merge branch 'master' of https://github.com/kennethfinnesand/is107-gruppe13-bteam

Conflicts:
	admin/adminvegg.php