Merge branch 'Borders'
heroku changes
Updated changes
Merge branch 'master' of https://github.com/ebarr/smile