mobile
Merge branch 'master' of ssh://10.129/var/www/ryhmatyo

Conflicts:
	content/etusivu.php
	content/footer.php
	content/header.php
	style.css
WHOOPS!