Update Gemfile

Added 'tzinfo-data' as I had to install this to get beyond a timezone error - might be my setup. Feel free to disregard
Update code.html.haml

Hemingwaying to make it clearer (hopefully)
Fix twitter link for correct account
Merge pull request #124 from kaichanvong/master

Fix twitter link for correct account
resolve merge issue
Merge branch 'janedallaway-patch-5'
Merge branch 'patch-3' of github.com:janedallaway/planner into janedallaway-patch-3
update Gemfile.lock
Merge branch 'janedallaway-patch-3'
Update invite_coach.html.haml

Just received one of these, so thought I'd clean the text up a little bit (and sorted the capitalisation out of GitHub)
Merge pull request #125 from janedallaway/patch-7

Update invite_coach.html.haml
csv response on workshop invitation page - suitable for name badge use.
Merge pull request #128 from jlsync/master

csv response on workshop invitation page - suitable for name badge use.
Don't html encode csv output
Merge pull request #129 from jlsync/master

Don't html encode csv output