resolving
resolve
pulling
merge
Merge branch 'master' of github.com:thnbgr/310-Lab3
a