fixing merge conflict
#58: finished for integer board
#closes #19