started merge
clean up
updated gems
update
update
Merge branch 'merge'