Mvp branch

Deciding to merge the MVP branch with development so we can have the most up to date version of our project to Heroku