changes
Merge branch 'master' of https://github.com/jimyw/cs247-2104-p3
added callback to main1 and working on main2
fixed conflicts