Merge branch 'master' of github.com:caseymacphee/RPi-HAUS
Merge pull request #4 from miracode/master

Initialized Django
Revert "Initialized Django"
Merge pull request #5 from caseymacphee/revert-4-master

Revert "Initialized Django"
Revert "Revert "Initialized Django""
Merge branch 'master' of github.com:caseymacphee/RPi-HAUS
Merge pull request #6 from caseymacphee/revert-5-revert-4-master

Initialized Django
Merge branch 'master' of github.com:caseymacphee/RPi-HAUS
first pass at models
registered models to admin view
Adds an api route for devices, no corresponding model
Merges with haus/models
Adds devices API route
Adds a working test of /devices/ route
Cleans up tutorial garbage
Cleans up test model in api app
Merge pull request #7 from jbbrokaw/django-rest-framework

Django rest framework
Merge branch 'master' of github.com:caseymacphee/RPi-HAUS
changing settings
added psycopg2 to requirements