added proposal and changes to add_homework layout
merged file