Getting everything up to speed
Merge branch 'master' of github.com:minttoothpick/riverdale