ignore
Merge branch 'master' of https://github.com/pungme/youasastranger

Conflicts:
	.gitignore