change inputs, add syntax checks
fix merge conflict
Merge branch 'dev' of github.com:hmgoalie35/Program3 into dev
fix merge conflict
merge conflict