commit
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	.DS_Store
3/7/13 @ 7:33pm
Merge remote-tracking branch 'origin/gh-pages'