.
Merge branch 'master' of https://github.com/kgerov/IGNEEL

Conflicts:
	sample_file_commit.txt