fixed merge conflicts and deleted controller file
fixed merge conflicts and deleted controller file

jybjones/minitwit,sscotth/minitwit,bmacheski/minitwit,johnwquarles/minitwit,NSS-Cohort-9/atmebro,SimoneGonzalez/atmebro,katyjustiss/atmebro,johnwquarles/minitwit,SimoneGonzalez/atmebro,NoahYarian/minitwit,katyjustiss/atmebro,NSS-Cohort-9/atmebro,ccates23/minitwit,sscotth/minitwit,bmacheski/minitwit,ccates23/minitwit,NoahYarian/minitwit,jybjones/minitwit