final bits
Merge branch 'master' of https://github.com/jeshuamaxey/goodnight
Merge branch 'master' of https://github.com/jeshuamaxey/goodnight
fixes main.controller.js