a
Merge branch 'master' of https://github.com/DavidSalzer/wikidots

Conflicts:
	StyleSheet.css
	index.php
a