str and coding issue
remove Chinese
design webpages
fix signup problem
jpclass finished with back check
Merge branch 'master' of https://github.com/gysy/dijkstra-jp

Conflicts:
	src/account/__init__.pyc
	src/account/admin.pyc
	src/account/models.pyc
	src/account/urls.pyc
	src/account/views.pyc
	src/db.sqlite3
	src/jpclass/__init__.pyc
	src/jpclass/admin.pyc
	src/jpclass/models.pyc
	src/score/__init__.pyc
	src/score/admin.pyc
	src/score/models.pyc
	src/signup/__init__.pyc
	src/signup/admin.pyc
	src/signup/models.pyc
	src/stationary/__init__.pyc
	src/stationary/admin.pyc
	src/stationary/models.pyc
	src/stationary/urls.pyc
	src/stationary/views.pyc
	src/survey/__init__.pyc
	src/survey/settings.pyc
	src/survey/urls.py
	src/survey/urls.pyc
	src/survey/wsgi.pyc
Merge branch 'sybranch'

Conflicts:
	src/account/views.pyc
	src/db.sqlite3
	src/jpclass/models.pyc
	src/score/models.pyc
	src/signup/models.pyc
	src/signup/urls.pyc
	src/signup/views.pyc
	src/survey/urls.pyc
Merge branch 'master' of https://github.com/gysy/dijkstra-jp

Conflicts:
	src/account/__init__.pyc
	src/account/admin.pyc
	src/account/models.pyc
	src/account/urls.pyc
	src/account/views.pyc
	src/db.sqlite3
	src/jpclass/__init__.pyc
	src/jpclass/admin.pyc
	src/jpclass/models.pyc
	src/score/__init__.pyc
	src/score/admin.pyc
	src/score/models.pyc
	src/signup/__init__.pyc
	src/signup/admin.pyc
	src/signup/models.pyc
	src/stationary/__init__.pyc
	src/stationary/admin.pyc
	src/stationary/models.pyc
	src/stationary/urls.pyc
	src/stationary/views.pyc
	src/survey/__init__.pyc
	src/survey/settings.pyc
	src/survey/urls.py
	src/survey/urls.pyc
	src/survey/wsgi.pyc
Merge branch 'master' of https://github.com/gysy/dijkstra-jp

Conflicts:
	src/account/__init__.pyc
	src/account/admin.pyc
	src/account/models.pyc
	src/account/urls.pyc
	src/account/views.pyc
	src/db.sqlite3
	src/jpclass/__init__.pyc
	src/jpclass/admin.pyc
	src/jpclass/models.pyc
	src/score/__init__.pyc
	src/score/admin.pyc
	src/score/models.pyc
	src/signup/__init__.pyc
	src/signup/admin.pyc
	src/signup/models.pyc
	src/stationary/__init__.pyc
	src/stationary/admin.pyc
	src/stationary/models.pyc
	src/stationary/urls.pyc
	src/stationary/views.pyc
	src/survey/__init__.pyc
	src/survey/settings.pyc
	src/survey/urls.py
	src/survey/urls.pyc
	src/survey/wsgi.pyc
jpclass ok
finish Examscore design
Merge branch 'master' of https://github.com/gysy/dijkstra-jp

Conflicts:
	src/db.sqlite3
	src/jpclass/models.pyc
	src/jpclass/urls.pyc
	src/jpclass/views.pyc
	src/signup/urls.pyc
	src/signup/views.pyc
	src/survey/urls.pyc
add js css etc.
Merge branch 'gybranch' of https://github.com/gysy/dijkstra-jp into gybranch

Conflicts:
	src/account/__init__.pyc
	src/account/admin.pyc
	src/account/models.pyc
	src/account/urls.pyc
	src/account/views.pyc
	src/db.sqlite3
	src/jpclass/__init__.pyc
	src/jpclass/admin.pyc
	src/jpclass/models.py
	src/jpclass/models.pyc
	src/score/__init__.pyc
	src/score/admin.pyc
	src/score/models.py
	src/score/models.pyc
	src/signup/__init__.pyc
	src/signup/admin.pyc
	src/signup/models.py
	src/signup/models.pyc
	src/stationary/__init__.pyc
	src/stationary/admin.pyc
	src/stationary/models.pyc
	src/stationary/urls.pyc
	src/stationary/views.pyc
	src/survey/__init__.pyc
	src/survey/settings.pyc
	src/survey/urls.pyc
	src/survey/wsgi.pyc
jpclass finish and merge gybranch with master
Conflicts:
	src/account/models.pyc
	src/account/views.pyc
	src/db.sqlite3
	src/jpclass/models.pyc
	src/jpclass/urls.pyc
	src/jpclass/views.pyc
	src/score/models.py
	src/score/models.pyc
	src/signup/models.pyc
	src/signup/views.pyc
	src/stationary/models.pyc
	src/survey/urls.pyc
small conflit handle
delete all word submit in names
Merge branch 'gybranch' into sybranch

Conflicts:
	src/account/__init__.pyc
	src/account/models.pyc
	src/account/views.py
	src/account/views.pyc
	src/db.sqlite3
	src/jpclass/__init__.pyc
	src/jpclass/models.pyc
	src/jpclass/templates/jpclass/base.html
	src/jpclass/templates/jpclass/index.html
	src/jpclass/urls.py
	src/jpclass/urls.pyc
	src/jpclass/views.py
	src/jpclass/views.pyc
	src/score/__init__.pyc
	src/score/models.py
	src/score/models.pyc
	src/score/templates/score/index.html
	src/score/templates/score/result.html
	src/score/views.py
	src/score/views.pyc
	src/signup/__init__.pyc
	src/signup/models.py
	src/signup/models.pyc
	src/signup/urls.pyc
	src/signup/views.py
	src/signup/views.pyc
	src/stationary/__init__.pyc
	src/stationary/models.pyc
	src/survey/__init__.pyc
	src/survey/settings.pyc
	src/survey/urls.pyc
Merge branch 'sybranch' of https://github.com/gysy/dijkstra-jp into sybranch

Conflicts:
	src/score/templates/score/result.html