added gitignore
added README
removed /tmp from .gitignore
Merge remote-tracking branch 'heroku/master'

Conflicts:
	.gitignore
	README.md