Modify application controller , index, en.yml and routes for internationalization
Add available locale to application.rb, modify translations, add translations to views
Update Readme file
Merge branch 'master' of github.com:BatchZero/webcal
Merge branch 'master' of github.com:BatchZero/webcal
Merge branch 'master' of github.com:BatchZero/webcal
Merge branch 'master' of github.com:BatchZero/webcal
Merge branch 'master' of github.com:BatchZero/webcal
Fix merge conflict
Fix merge conflict
Fix merge conflicts
Fix merge conflict
Add static_pages_spec, minor changes to calendars_controller and calendar show view
Merge master into branch, fix broken tests, except calendars_controller tests
Fix tests
Upgrade Capybara
Actually upgrade capybara
Simpler heroku deploy
Merge branch 'master' of github.com:BatchZero/webcal