before merge
Merge branch 'master' of github.com:redduck3/CodeRush
Revert "before merge"

This reverts commit 2ed89c371cfa7e466acaab8dabbacebc0679a71b.
half