made final fixes and everything WORKS
Merge branch 'master' into dylan
Merge pull request #67 from mbathletes/dylan

Dylan