Merge branch 'master' of https://github.com/nix-php-training/ads-board2

Conflicts:
	index.php