fixed function calls
Merge branch 'master' of git://github.com/kalvinnchau/cse131

Conflicts:
	src/AssemblyCodeGenerator.java