inital commit after scaffold is built
Merge branch 'master' of https://github.com/rbraaf/wynfinite-loop