fix scrollbar
fix scrollbar
Merge branch 'master' of github.com:nitmic/Launcher

Conflicts:
	Level1.cpp
	Level2.cpp