index.html
Put js and css in seperate files, improve index
Fix merge conflict