Merge branch 'scaffolds' of https://github.com/mud-turtles-2014/ladybug
Merge branch 'master' of https://github.com/mud-turtles-2014/ladybug
update seed file
add DS_Store to .gitignore