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