Initial commit
Change README
Add .gitignore
Change gem file on gemspec
Fix conflicts