Slider added
Merge branch 'master' of https://github.com/icpcpp/edward

Conflicts:
	gui/MainWindow.cpp
	gui/MainWindow.hpp
Merge branch 'master' of github.com:icpcpp/edward