commit suicide

penis
Merge branch 'master' of https://github.com/Memetski/prosjekt2

Conflicts:
	db.php