merge Merge branch 'master' of github.com:theahindle/smelly-skeleton
merge
Merge branch 'master' of github.com:theahindle/smelly-skeleton

theahindle/smelly-skeleton,theahindle/smelly-skeleton,theahindle/smelly-skeleton,ashleyhindle/smelly-skeleton,ashleyhindle/smelly-skeleton,ashleyhindle/smelly-skeleton