initial midterms commit
initial download of Emilys version
added initial tip tabbing
added emilys final version
fixed merge error