sync with master
sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	Team--Scorch--teamwork/Website/styles/style.css
Revert "sync"

This reverts commit a561c8bcd8c91c78a1780e94b0829d6becc904aa.

Conflicts:
	Team--Scorch--teamwork/Website/styles/style.css
Revert "sync with master"