commit because i need to merge
Merge branch 'master' of https://github.com/lopno/aaubordfodbold

Conflicts:
	project/public_html/classes/admin.php
just for merge
just for merge
merge
Merge branch 'master' of https://github.com/lopno/aaubordfodbold
all
merge
Merge branch 'master' of https://github.com/lopno/aaubordfodbold
Merge branch 'master' of https://github.com/lopno/aaubordfodbold
merge