basic index and extra png
merge conflicts
modified files, only index has proper js and css files
modified package.json
updated index.html
updated index again
Merge pull request #2 from wongp/master

pull request ---> merge