removed old code from app controller, fixed user location bug
merge conflict on user#show