laptop version
Merge http://github.com/lk16/squared

Conflicts:
	src/bot_ali.cpp
	src/gamecontrol.cpp
local changes
Merge branch 'master' of https://github.com/lk16/squared

Conflicts:
	src/board.cpp
	src/bots/bot_ali.cpp
	src/game/gamecontrol.cpp
added subfolder src/main (oops)