Merge pull request #4 from karepker/master

Working version of yovary!
Revert "Update page.tpl"

This reverts commit 5391412a3717406aa3bf9f35f2c32d60e5ccdcde.
Revert "Revert "Update page.tpl""

This reverts commit d638cc2e6a56adac89b52807e476fd3604e009dd.
Merge branch 'master' of https://github.com/HowlandsMovingCastle/yovary
Merged.
Merge branch 'master' of github.com:HowlandsMovingCastle/yovary