First real commit
Merge branch 'master' of github.com:bathweb/funnelback-report

# By University of Bath Digital Team
# Via University of Bath Digital Team
* 'master' of github.com:bathweb/funnelback-report:
  Initial commit

Conflicts:
	.gitignore