From d52234070155d6c676e372a8863115502e2115e6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 13 Feb 2016 15:17:40 -0500 Subject: update stuff --- Makefile | 3 +-- www/PPE_Information.html | 44 +++++++++++++++++++++++--------------------- www/alert.html | 4 ++-- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 1799f2f..45f21e5 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,10 @@ GSED = sed WGET = wget -c --no-use-server-timestamp pdfjs = https://github.com/mozilla/pdf.js/releases/download/v1.0.907/pdfjs-1.0.907-dist.zip -frc_safety_manual = http://www.usfirst.org/sites/default/files/uploadedFiles/Robotics_Programs/FRC/Resources/2015%20FRC%20Team%20Safety%20Manual-%20FINAL%202.6.15.pdf +frc_safety_manual = http://www.firstinspires.org/sites/default/files/uploads/resource_library/frc/team-resources/safety/2016/frc-team-safety-manual.pdf platforms = android browser - sources = \ www/FIRST_Safety_Manual.pdf \ www/pdfjs \ diff --git a/www/PPE_Information.html b/www/PPE_Information.html index f8c03c5..99365e5 100644 --- a/www/PPE_Information.html +++ b/www/PPE_Information.html @@ -17,27 +17,29 @@ Safety glasses assignments:
    -
  1. 1. Cassie Alsop
    2. -
  2. 2. Eric Jacoby
    3. -
  3. 3. Jeremiah Kemp
    4. -
  4. 4. Michael Hoover
    5. -
  5. 5. AnnaLaura Nufer
    6. -
  6. 6. Nicole Whittle
    7. -
  7. 7. Hunter Greene
    8. -
  8. 8. Juan Salazar
    9. -
  9. 9. Elizabeth Snyder
    10. -
  10. 10. Mason Wilson
    11. -
  11. 11. Evan Easton
    12. -
  12. 12. Adi Ben-Yehoshua
    13. -
  13. 13. Jared Heller
    14. -
  14. 14. Mitchell Jorczak
    15. -
  15. 15. Veronica Shaffer
    16. -
  16. 16. Catherine Spyr
    17. -
  17. 17. Luke Shumaker
    18. -
  18. 18. Same Cook
    19. -
  19. 19. Josh Chang
    20. -
  20. 20. Jason Ang
    21. -
  21. 21. Cole Griffin
    22. +
  22. 1. Isaac Clyde
    23. +
  23. 2. Hunter Greene
    24. +
  24. 3. Thomas Griffith
    25. +
  25. 4. Josh Hanback
    26. +
  26. 5. Michael Hoover
    27. +
  27. 6. Aaron Huycke
    28. +
  28. 7. Isaiah Martin
    29. +
  29. 8. Noah Martin
    30. +
  30. 9. AnnaLaura Nufer
    31. +
  31. 10. Elizabeth Raber
    32. +
  32. 11. Abbey Rohler
    33. +
  33. 12. Juan Salazar
    34. +
  34. 13. Mason Wilson
    35. +
  35. 14. Maria Xioufaridou
    36. +
  36. 15. Braydon Tilly
    37. +
  37. 16. Zachary Criswell
    38. +
  38. 17. Adi Ben-Yehoshua
    39. +
  39. 18. Alex Henry
    40. +
  40. 19. Jason Ang
    41. +
  41. 20. Josh Chang
    42. +
  42. 21. Luke Shumaker
    43. +
  43. 22. Matthew Hurwitz
    44. +
  44. 23. Nick Towell
    45. diff --git a/www/alert.html b/www/alert.html index 6c7fcb0..5f0842f 100644 --- a/www/alert.html +++ b/www/alert.html @@ -16,7 +16,7 @@

    Safety Committee Members

    Safety Mentor - Adi - Safety Captain - Cassie - Shop Safety Supervis - Hunter + Safety Captain - Josh + Shop Safety Supervisor - Hunter -- cgit v1.2.3-54-g00ecf