Fixing some spelling mistakes.
Merge branch 'master' of ssh://crossingguard-penguinforge.rhcloud.com/~/git/crossingguard

Conflicts:
	wsgi/templates/index.html
Fixing Merge Issues.