edited somefile in pico
Merge branch 'master' of git://github.com/Esco482/Creative-and-Quantitative-Assignments
deleted a file, edited a file