meh.
Merge branch 'master' of https://github.com/thetriangle/triphoto

Conflicts:
	home.php