first commit
Merge https://github.com/kimothy/fan

Conflicts:
	README.md