try again
Merge branch 'master' of https://github.com/LiuyinC/MDLab

Conflicts:
	Project_1_1.py
Merge branch 'master' of https://github.com/LiuyinC/MDLab

Conflicts:
	Project_1_1.py
	lab1_sgm.py