resets gitignore to start ignoring application.yml again after push
completes merge before pull
Merge branch 'master' of github.com:rebeccagreenblatt/compliments
commits helper module before pulling
Merge branch 'master' of github.com:rebeccagreenblatt/compliments
adds helper methods to slim down controller. app done for now!