All updates.
Merge branch 'master' into HEAD

Conflicts:
	Marvin.py
Merge branch 'new_branch_name'
Merge branch 'master' into new_branch_name
Clips directory
Merge pull request #1 from TyIsI/master

Ty's updates