Initial commit
Merge pull request #1 from projectcs13/sprint2.rebar

Sprint2.rebar

Former-commit-id: c758c0e3daf7096d4cbc2f73cecb200dadeb1f17
Merge pull request #2 from projectcs13/master

Merge develop with master

Former-commit-id: 25ce90ec594327c9404c8e177a961d6fc8d40422
Merge pull request #3 from projectcs13/sprint1.HTML-for-streams

Add HTML page for POST and GET of streams to a RESTful server

Former-commit-id: f88ab7e0abf90d4107d41bee5959b32515016ee6
Merge pull request #4 from projectcs13/sprint2.database

Sprint2.database

Former-commit-id: c15f8e21aee88d6ecc416d7253ced5e0b2383171
Merge branch 'develop' of github.com:projectcs13/sensor-cloud into develop


Former-commit-id: b5e14e282242fca1a1b68c197f18257c58022964
Merge branch 'develop' of ssh://github.com/projectcs13/sensor-cloud into sprint2.project_structure


Former-commit-id: 0486d4949487a1f431eb4910f68aa62051d89e2e
Merge pull request #10 from projectcs13/sprint2.db_api.create_and_get_user

Sprint2.db api.create and get user

Former-commit-id: 94be040841ef9b37f7a88a4c285ad517cfc3f6c8
Merge pull request #11 from projectcs13/Sprint2.Some_HTML_Files

HTML Pages for User Register, Login, New Resource

Former-commit-id: 4c433d185e12600b385bec5aa2ae032fc89931b5
Merge branch 'develop' of ssh://github.com/projectcs13/sensor-cloud into sprint2.project_structure


Former-commit-id: 1f9a78d26ac817238063311d5dc6903a7243aed1
Merge pull request #13 from projectcs13/sprint2.db_api_authenticate

Sprint2.db api authenticate

Former-commit-id: c6b67caded0f7df69e5a6072cf0647e669ff4ce7
Merge pull request #19 from projectcs13/sprint2.db_api_streams

Sprint2.db api streams

Former-commit-id: 21fc9d858bf4069d0c7fb45b675816757f7e3c4e
Merge branch 'sprint2.stream-handler' of github.com:projectcs13/sensor-cloud into sprint2.stream-handler


Former-commit-id: 5bdba72584d8b8e5d3a157db0a23d5bda19abc8e
Merge branch 'develop' of ssh://github.com/projectcs13/sensor-cloud into sprint2.project_structure


Former-commit-id: 7ce8f43187d433bbe98e4a41d935215144e29ca2
Merge pull request #18 from projectcs13/sprint2.change_database.hrl

Sprint2.change database.hrl

Former-commit-id: cdc3ddf1b02bd2b9c96791321c8565b2b0bb9d6e
Merge branch 'sprint2.stream-handler' of ssh://git@github.com:22/projectcs13/sensor-cloud.git into sprint2.stream-handler

Former-commit-id: d76dbeb443b3c51784b3caa14907221438aa9045
Merge branch 'sprint2.stream-handler' of ssh://git@github.com:22/projectcs13/sensor-cloud.git into sprint2.stream-handler

Former-commit-id: 9cd13dbce7bbcd6030165733d5a3b9a412345821
Merge branch 'develop' of github.com:projectcs13/sensor-cloud into sprint2.db_api_resources

Conflicts:
	engine/src/db_api.erl
	engine/test/db_api_tests.erl

Former-commit-id: 21ffa1b608783667a59769f56a80e41bea7a3833
Merge pull request #21 from projectcs13/sprint2.db_api_resources

Sprint2.db api resources

Former-commit-id: a6ea446f57925c4227260255bdd76c2bf790ad7f
Merge branch 'develop' of ssh://github.com/projectcs13/sensor-cloud into sprint2.project_structure

Conflicts:
	engine/Makefile

Former-commit-id: dbb63fa914b18afc5b7e1a4e5a3c8eac6bc88866