fixed .gitignore
commit
Merge branch 'master' of https://github.com/yotamlaufer/JSONRPC-Tester

Conflicts:
	.DS_Store