Merge branch 'master' of github.com:whitneyit/seed