Merge branch 'master' of github.com:hippysurfer/scout-records
ignore some stuff