getJSON fiddling and put dist in gitignore file
merged amy and master
added fake data to get templates functional
merged gh-pages
merging master to allow deployment