First commit
Merge branch 'master' of https://github.com/chaimann/cofi

Conflicts:
	Gemfile.lock
	README.rdoc