Added the rest framework package as a dependency
Added the rest framework to installed apps
We can now pull data out of the database
Fixed some merge conflicts