did gitignore cache reset
merge
Merge branch 'development' of github.com:AdamGoodApp/cheerup into development
'rere'
Merge branch 'development' of github.com:AdamGoodApp/cheerup into development
corrected the seed file