[IMP] Third commit.

[IMP] Second squash.

[ADD] New name.

[IMP] Fourth commit.

[IMP] Fifth commit.
Merge branch 'master' of github.com:simongoffin/Squash

Conflicts:
	file.py