new
Merge branch 'master' of https://github.com/chris19891128/EECS394-2

Conflicts:
	EasyPolling/js/site.js