add level transitions
Merge branch 'master' of github.com:maarten990/Graphics

Conflicts:
	week_6/main.cpp
remove commented code