fixing some stuff
merge
Merge branch 'master' of github.com:okfocus/okfocus.github.com