votelist is writtem
Merge branch 'master' of github.com:csy113/iems5718
Merge branch 'master' of github.com:csy113/iems5718
uncomplete version for view js
modify css
Merge branch 'master' of github.com:csy113/iems5718

Conflicts:
	js/view.js