Third Commit
Merge branch 'master' of https://github.com/seankross/modules

Conflicts:
	.DS_Store
	roger/.DS_Store