fixed merged assets
Merge branch 'master' of github.com:mghayes/compound
fixed a typo in asset compiler
Merge pull request #319 from mghayes/master

fix merged assets