Makefile updates
Merge branch 'master' of github.com:shapeshed/shapeshed.com
move to single line
rename article