Revert "Revert "Merge branch 'master' of https://github.com/pcutler/pcutler-web""

This reverts commit 6780c6c164a13ac5e88352249b6c89599e3119ac.