Removes duplicate controller, fixing js error
Merge branch 'master' of github.com:tyrel86/google_hackathon_front_end