Main menu beta (butoane de 2 lei) boikan style
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controller.cpp
	Controller.h
	Texture.cpp
	Texture.h
	Tools.h