before pull
Merge branch 'master' of https://github.com/Trayus/csc344

Conflicts:
	project2(jasmid)/synth.js
before pull
Project 3 (nearly done hopefully)