Initial commit of skeleton gem project
Fixed merge conflict