Merge pull request #16 from projectcs13/develop

Finish user edit and update actions
Merge pull request #19 from projectcs13/develop

Develop
Update README.md

Include travis build status
Fix conflicts
Initial commit of group MVC
working basic tests
Merge pull request #25 from projectcs13/sp3.sc1.groupMVC

Initial commit of group MVC
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp3.demo

Conflicts:
	config/routes.rb