Merge pull request #1 from shmeadyy/argv

practice commit
got rid of some changes
Merge pull request #2 from shmeadyy/fixing_lauras_bullshit

got rid of some changes
all done!