Adding murphy classes'
Merge branch 'master' of https://github.com/leoxlin/seed

Conflicts:
	.cache