modified the .gitignore file
fixed the .gitignore confilect
modified choices layout
fixed the .gitignore conflict
modified the student choice answer display
modified the teacher bubble chat when the student answer is correct
modified the css about the confirm dialog
Merge branch 'master' of github.com:HellMagic/x-mothership