wrote the README.md
Merge branch 'master' of https://github.com/thebrianzeng/Alfred

Conflicts:
	README.md
fixed README.md