added gitignore
giles and dmitry starting work on the front-end
resolved index.html merge conflict