Getting updated
Clean up
clean up again
Merge branch 'master' of https://github.com/jtleek/modules

Conflicts:
	.DS_Store
	jeff/.DS_Store