testing branch
Merge branch 'master' of github.com:johntrandall/Project2
loaded updated stylesheets and family show
panic test
adding to pull
Merge branch 'master' of github.com:johntrandall/Project2 into family_show_css
erbified kids view and styles.css
removed note from kids show html
Merge branch 'family_show_css'