Squishing the files!
Merge pull request #88 from ianbarber/master

Squishing the files!