Still updating the reports view.
add login form
Merge branch 'master' of https://github.com/eklyman/site-reporting into eklyman-master
Merge branch 'eklyman-master'
fixing conflicts.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting

Conflicts:
	public/services/report-service.js
	public/styles/styles.css
Merge pull request #8 from jacob-israel-turner/master

Merging...