getphp osv
hejsan
Merge branch 'master' of https://github.com/FredrikBergelin/ProjektG29

Conflicts:
	index.php
	registrering.php
Merge branch 'master' of https://github.com/FredrikBergelin/ProjektG29

Conflicts:
	index.php