committing to pull, no real change done
fixing merge conflicts
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Fixed merging conflicts
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
fixed merge issues, need to double check tho