sync
Merge branch 'robert' of https://github.com/CS1635-ClassMe/Repo2 into buck
no thread, now async