refactoring
Merge branch 'master' into refactor

Conflicts:
	src/tictactoe.cc
renamed all print_* methods to display_* methods, now handling bad input from user on main menu