New semester

Merging code into Master