Added a check
Merge branch 'master' of https://github.com/nighelles/Waves
Merge remote-tracking branch 'origin/master'

Conflicts:
	Waves/Engine.cpp