initial commit
Merge branch 'master' of https://github.com/SeanPlacchetti/placchetti330.git