Merge branch 'master' into davis-dev
Merge branch 'master' into davis-dev
Merge branch 'master' into davis-dev
Testing git push for the server
Continuing to set up environment
Continuing to set up environment
Continuing to set up environment
Continuing to set up environment
Continuing to set up environment
Continuing to set up environment
Continuing to set up environment
Continuing to set up environment
Finalized workflow. Correcting some issues and trying again.
Corrected password issue
Added frist add-user functionality
Corrected some errors
Converted add-device response to JSON
started API documentation
Merge branch 'master' into davis-dev
Cleaned up