Merge branch 'master' of https://github.com/mud-turtles-2014/ladybug
Merge branch 'master' of https://github.com/mud-turtles-2014/ladybug
delete json files from scaffold