resolve conflict
Merge branch 'layer1' of https://github.com/Weil0ng/cs270 into layer1