ignore old-stuff folder
Merge branch 'master' into javascript-keep-state