base models created, some association issues with users
Merge branch 'master' of github.com:bgkennedy2000/cheerup_app