thefuck
Merge branch 'master' of https://github.com/ksoffen/cs51project

Conflicts:
	.DS_Store
erm
erm
pickleee