stage
committing some changes made long ago
Merge branch 'master' of github.com:hammer2j2/redirect
merging between different laptop copies