ff
Merge remote-tracking branch 'origin/master'
ere
gfddsgf
Merge remote-tracking branch 'origin/master'
gfgh
Merge remote-tracking branch 'origin/master'

Conflicts:
	our_files/src/IC/lir/LirTranslator.java
vcg
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'