Clean up dependencies
Fix merge conflicts
Remove Gemfile.lock
Merge pull request #10 from sweatshirtio/dependency

Clean up dependencies