commit 3/07/13 @ 7:18pm
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	.DS_Store