deleted controller for merge conflict reasons
Merge pull request #7 from fiery-skippers-2014/dar_erin

deleted controller for merge conflict reasons
fixed merge conflict