init local
commit to merge
test
Merge branch 'master' into gh-pages
added 2 new ideas to the json data file
Merge branch 'master' into gh-pages