Grammar/AP Style changes
Merge branch 'master' of https://github.com/yeamal/UnclassProject

Conflicts:
	script.js