get data from db
Merge branch 'master' of https://github.com/DavidSalzer/wikidots

Conflicts:
	index.php
update style