added tmp
Merge branch 'master' of github.com:PCD/tepicnay

Conflicts:
	.gitignore