Merge remote-tracking branch 'remote/master'
updating files that should be ignored
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store
	sources/.DS_Store
Corrected a small typo
Merge pull request #35 from timrichardson/master

Correction to minor typo (missing ' ' )