nothing much, worked in new master by mistake
Merge branch 'the_new_master_wed_night' of github.com:johntrandall/Project2 into the_new_master_wed_night
resolving git nightmare issues
add child show child in family show up and running AGAIN
pushing to pull
Freaking github garbage
pull issues
fix that conflict
worked out family show add child bugs
Merge branch 'the_new_master_wed_night' of github.com:johntrandall/Project2 into the_new_master_wed_night