Adds characterServlet to web.xml
Adds files to gitignore
Merge remote-tracking branch 'origin/master'