change same line
Merge branch 'base' of https://github.com/letimome/stack-spl into base

Conflicts:
	util/Stack.java