branch text
Merge branch 'master' of https://github.com/Argun/nifty

Conflicts:
	first_branch.txt