revert back to original layout
fixed index merge conflict
Merge branch 'master' of github.com:StephanMusgrave/ProjectX