Fix merge conflict in index.html
Merge pull request #12 from concreted/master

Fix merge conflict in index.html
Add CORS headers to routes
Merge pull request #13 from concreted/master

Add CORS headers to routes
Add CircleCI status badge to README.md
add waffle.io badge
app.use CORS headers
Merge pull request #14 from waffle-iron/master

waffle.io Badge
Merge pull request #16 from concreted/master

app.use CORS headers