.
Merge branch 'master' of https://github.com/mojsilo/yanadosite

Conflicts:
	footer.php