Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store
	.gitignore
Merge pull request #2 from HandsomeCharming/master

Merge remote-tracking branch 'HandsomeCharming'