Merge branch 'master' of https://github.com/TheVillageIdiot2/waitonbot

im a fukin dummy and didnt pull before doing work

CallOfTheVoid.py

@@ -3,9 +3,9 @@ from slackclient import SlackClient
 
 #One last call from beyond the grave
 apifile = open("apitoken.txt", 'r')
-SLACK_API = next(apifile)
+SLACK_API = next(apifile).strip()
 apifile.close();
 
 slack = SlackClient(SLACK_API)
-slack.api_call("chat.postMessage", channel="@jacobhenry", text="Alas poor yorrick. I died!")
+slack.api_call("chat.postMessage", channel="@jacobhenry", text="one error. and im die?")
 

WaitonUtil.py

@@ -7,7 +7,8 @@ Only really kept separate for neatness sake.
 """
 
 #ID of waiton sheet on drive
-WAITON_SHEET_ID = "1J3WDe-OI7YjtDv6mMlM1PN3UlfZo8_y9GBVNBEPwOhE"
+#WAITON_SHEET_ID = "1J3WDe-OI7YjtDv6mMlM1PN3UlfZo8_y9GBVNBEPwOhE" #A term 2016
+WAITON_SHEET_ID = "1I4keh9cIt0x-WwZAdnBsZefSZV-tMIAy37r2NLUOLh4" #First week b term
 
 
 

sortedfamilytree.txt

@@ -723,3 +723,26 @@
 1008: Andrew Brunelle
 1009: Ziyang "Gavin" Yu
 1010: Tucker Martin
+1011: Tejas Rao
+1012: Matthew Collins
+1014: Andrew Gregory
+1015: John Bonina
+1016: Sean McCluskey
+1017: Jacob Rems
+1018: James McAleese
+1019: Jacob Henry
+1020: James Taylor
+1021: Ryan St. Hilaire
+1022: Jimmy Tran
+1024: Brent Reissman
+1025: David Cadilek
+1026: James Owens
+1027: Diego Infanzon
+1028: Trevor Alexander
+1029: Nikolas Gamarra
+1040: Ryan O'Brien
+1041: Chenggu Wang
+1041: Johnny Wang
+1042: Howard Vance
+1044: Evan Hasenfeld
+1045: Kien Nhan