gitignore
update solved

Conflicts:
	lib/stack.rb
	spec/stack_spec.rb
gitignore
Merge branch 'solved'

Conflicts:
	.ruby-version
	lib/stack.rb
	spec/stack_spec.rb