Merge pull request #2 from karepker/master

More yoing
Updated design for the two webpages

We are all set, except the Yo button is still not showing! What a
drag!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	page.tpl
Cleaned up html on contact page and added target for it in base python file.