Merge pull request #47 from projectcs13/develop

Develop
Add production API URL
Merge pull request #112 from projectcs13/develop

Develop
Merge pull request #114 from projectcs13/develop

Develop
Merge pull request #117 from projectcs13/develop

Develop
Merge pull request #121 from projectcs13/develop

Develop
Update frontpage.js.coffee
Merge pull request #159 from projectcs13/develop

Develop
Merge pull request #207 from projectcs13/develop

Develop
Update _stream_results.html.erb

no decimals for percentage.
Merge branch 'master' of heroku.com:lit-caverns-3776

Conflicts:
	config/config.yml
Fix conflicts
Merge pull request #270 from projectcs13/develop

Develop
Merge pull request #279 from projectcs13/develop

Develop
Merge pull request #306 from projectcs13/develop

Develop
Merge pull request #310 from projectcs13/develop

Develop
Merge branch 'master' of github.com:projectcs13/sensor-cloud-website

Conflicts:
	config/config.yml
Merge pull request #311 from projectcs13/develop

Develop
Merge pull request #318 from projectcs13/develop

Develop
Update the README.md file