Added print 2 lines to newfeature
Merge remote-tracking branch 'origin/newfeature'

Conflicts:
	src/code.py