Merge branch 'alex' of https://github.com/clnoll/snapr into cnoll
Merge branch 'alex' of https://github.com/clnoll/snapr into cnoll
added template files for angular
add angular templates
Merge branch 'cnoll' of https://github.com/clnoll/snapr into alex
added sinatra json