updated README
updated .gitignore
Merge branch 'master' into martini

Conflicts:
	.gitignore