add files
Merge branch 'master' of github.com:someus/fate_test

Conflicts:
	README.md