home and landing
Merge branch 'master' of https://github.com/vertika/triki

Conflicts:
	Landing.php