Added families and children. No authorization yet.
Merge branch 'master' of https://github.com/gzy13245/CSCE606-Project_SOS

Conflicts:
	TAMUChineseSchool_final_final/app/models/user.rb
	TAMUChineseSchool_final_final/config/routes.rb
	TAMUChineseSchool_final_final/db/schema.rb
	TAMUChineseSchool_final_final/log/development.log