i started a war
Merge branch 'master' of github.com:polleverywhere/school

Conflicts:
	README.md