stage
update
Merge branch 'master' of https://github.com/thunderdomes/Trololol

Conflicts:
	index.php
Merge branch 'master' of https://github.com/thunderdomes/Trololol
a
Merge branch 'master' of https://github.com/thunderdomes/Trololol
Merge branch 'master' of https://github.com/thunderdomes/Trololol
a
asd
Merge branch 'master' of https://github.com/thunderdomes/Trololol
Merge branch 'master' of https://github.com/thunderdomes/Trololol