Daniel Rosenwasser 50c4290da6 Merge branch 'master' into testPerf
Conflicts:
	Jakefile.js
	src/compiler/program.ts
	src/compiler/types.ts
	src/harness/harness.ts
	src/harness/projectsRunner.ts
	src/harness/runner.ts
2015-06-08 14:45:38 -07:00
..
2015-06-08 14:45:38 -07:00