final
Merge branch 'master' of https://github.com/faridkhan/first

Conflicts:
	config.xml