heyo
heyo2
Merge branch 'master' of https://github.com/sttereve/Ffun

Conflicts:
	index.php
pewpw
Merge branch 'master' of https://github.com/sttereve/Ffun
aaarg