merging upstream/master
merged conflicts
merging upstream/master
Merge pull request #73 from bloodhawk/master

adds getAllUsers for users and getOneByMonth for reports
Merge pull request #74 from bloodhawk/master

remove output.txt
typos
Merge pull request #76 from bloodhawk/master

add service in reportmodel to services object
merging upstream/master
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge pull request #75 from jacob-israel-turner/master

typos
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
adds to trends view
Merge pull request #77 from eklyman/master

adds to trends view
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
adds report modal ctrls
Merge pull request #78 from eklyman/master

adds report modal controllers to index
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
adding authorisation middleware and cleaning up server.js
cleaning server.js
Merge pull request #79 from jasonalmaturner/master

Adding authorization middleware and cleaning up server.js