Merge pull request #65 from mbathletes/dylan

Dylan
updated styling
made final fixes and everything WORKS
Merge pull request #66 from mbathletes/orlandov

updated styling
Merge branch 'master' into dylan