added other.txt
update
Merge branch 'master' of https://github.com/akhilgogia/demo

Conflicts:
	other.txt