Merge branch 'master' into Travis's-Edits
Revert "Merge branch 'JPP-Edits'"

This reverts commit 5dd697f5207109942be5d5c01d9b8bfd8971862c, reversing
changes made to d488cb8b90394ab514ab5ad09891da51c3286648.

Conflicts:
	Mobile Menu/menu.css
Revert d488cb8..e9ac43c

This rolls back to commit d488cb8b90394ab514ab5ad09891da51c3286648.
JPP addition requests

swearing in css
Sync TW into Master w/ Conflicts