Changed new_file h-g
Merge branch 'master' of github.com:jkubacki/herkules-git

Conflicts:
	new_file
Yeah, i chose my code. Yours sux ballz...