20130804 13.56 wf
Merge branch 'master' of https://github.com/wf1768/vitawebsite