Merge pull request #1 from jesserosato/master

Update
Merge branch 'master' of https://github.com/jesserosato/jaams-web