updated .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
updated FromTo page
Merge remote-tracking branch 'origin/master'