uuh yeah
Modify location tests for internationalization
Merge branch 'master' of github.com:carolinagc/webcalendar
Add badges to readme
Update the readme
Merge pull request #12 from carolinagc/UpdateReadme

Update readme
Merge branch 'master' of github.com:carolinagc/webcalendar
Modify and added the url of the demo site
Modify tests for internationalization, changed views with forgotten locale syntax, add deleteIcon div id to main.css
Modify routes so that root is calendar view
Merge branch 'master' of github.com:carolinagc/webcalendar
Revert "uuh yeah"

This reverts commit 54f187c1d62e1adf584e82038b7626321bb18968.
refactor organizer spec
Merge branch 'master' into UpgradeRuby21
Merge branch 'master' into UpgradeRuby21