Initial commit
updated homepage in gemspec
fixed a merge conflict