compile modified
Merge branch 'master' of https://github.com/jcapoduri/C2Si-boilerplate

Conflicts:
	compile