fixed web-step merge conflicts
Merge branch 'master' of github.com:StephanMusgrave/ProjectX