sgen form complete and fixed bug in sgen
Merge remote-tracking branch 'origin/student-generator-form-and-props'