Merge pull request #25 from Hartman2/master

Some Main sutff
Merge pull request #2 from Coms362/master

main method work
Merge pull request #26 from rdincher/master

Merge pull request #2 from Coms362/master
Merge pull request #27 from Hartman2/master

Part of Main done
Merge pull request #3 from Coms362/master

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

main 1 done
Merge pull request #7 from Coms362/master

merging ryan's into mine