funkcny makefile
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into mine

Conflicts:
	Jenny/src/Jenny.java