merging upstream/master
merged conflicts
merging upstream/master
merging upstream/master
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
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
sets up reports controllers