Added filter couper
Added *~ to .gitignore
Merge branch 'master' of https://github.com/xlambein/FSAB1402-Project

Conflicts:
	mix.oz