Merge pull request #3 from Coms362/master

main work
finished main 1
Merge pull request #28 from rdincher/master

main 1 done