fixing some things after changing everything
add waffle.io badge
Merge branch 'waffle-iron-master'