rspec performance controller complete
fixed merge conflict
Merge pull request #6 from mikewong79/performance

Performance