removed .lock-waf file
Merge branch 'master' of github.com:tgaurnier/WeatherFace

Conflicts:
	.lock-waf_linux2_build
Added .lock-waf_linux2_build to .gitignore