first commit (with all the code)
Merge branch 'master' of https://github.com/mcassiano/w4111_final_project