modified gemfile to include tzinfo for windows
Merge pull request #1 from Dawenster/front

Front
Merge branch 'master' of https://github.com/Dawenster/inflationatr
modified gemfile to troubleshoot tzinfo problems
fix bug around new line breaks
fix paragraph breaks
merge git conflict