local conf.
Merge branch 'master' of https://github.com/nivincp/test

Conflicts:
	info.txt