duplicate of wk10
big ol' commit
Merge branch 'master' of https://github.com/kprokken/rapid_web