merge commit
merge commit
Merge branch 'master' of https://github.com/photonerddan/parley.js
changed file stucture to isolate handlebar templates for precompilation