resolving conflicts in complaint controller js
Merge branch 'master' of https://github.com/roddiedude/hackathon