Add blur!
Switched to python lbp-cascade file
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_select_technique.xml
Fixed .gitignore
Add assets
Merge remote-tracking branch 'origin/master'