Added files
Merge branch 'master' of github.com:shnavid/afare

Conflicts:
	.gitignore
	afare.py