heroku
Merge branch 'develop'
Merge branch 'release/1.0'

release
This should fix our issues

You should use divs
screw you too