Add shipping discount
Added whitespace under changelog (formatting)
Merge pull request #1 from KamikazeXeX/master

Add shipping discount