Merge branch 'master' of /Users/TaekSoon/Documents/2014_PythonPingPong with conflicts.
main.html modified.