adding ignore
Merge remote-tracking branch 'origin/vyara-bhit-master'

Conflicts:
	.gitignore
adding a space
fixing merge conflicts
Merge branch 'master' of https://github.com/tibistibi/mTor.git
Merge pull request #5 from tibistibi/master

all errors fixed now ;)