Changes
fix
Resolve merge conflict
added notes, completed
Merge branch 'master' of github.com:reevesAstronomy/Web-Test
Conflicts for r2_index merge resolved