asd
add
fix
add
resolve conflict
ad
add
Update Gemfile
Merge pull request #50 from Verkalets/master

t