Merge pull request #4 from tjsga/2018-19

2018-19 Merge #3

README.md

@@ -1 +1,21 @@
 # 2018 SGA Website #
+
+Most people decide to put a fancy image here or something to impress the people looking at this GitHub and make it look official. I could care less.
+
+## How to test this site ##
+
+Pre-reqs: node.js, browser, brain
+
+Run the run.sh file and visit localhost:8080
+
+## How to edit this site ##
+
+Step 1: **DON'T EDIT IT IN DIRECTOR UNLESS YOU KNOW WHAT YOUR ARE DOING** (P.S. you most definitely DON'T know what you are doing if you haven't done this before)
+
+Step 2: Clone the GitHub Repo, and if this is a new school year, make a new branch in GitHub, copying the master branch, otherwise switch to the branch of the current school year. (if you are stuck at this step after using Google, please give up editing the site, and find someone more qualified to take your position on SGA)
+
+Step 3: Look at the site.json file and edit the appropriate values. **Keep a backup!** __If you mess up the site will crash__
+
+Step 4: Merge the current year's branch to the master branch
+
+Step 5: Pull the changes into director **after testing the site locally**

info.log

@@ -1,8 +0,0 @@
-0
-0
-0
-0
-0
-0
-0
-0

site.json

@@ -138,8 +138,8 @@
 		"title": "facebook",
 		"url": "https://www.facebook.com/tjsga"
 	},{
-		"title": "envelope",
-		"url": "mailto:sga.tjhsst@gmail.com"
+		"title": "instagram",
+		"url": "https://www.instagram.com/tj.sga/"
 	}],
 	"officers": [{
 		"title": "President",
@@ -160,7 +160,7 @@
 		"name": "Mia Yang",
 		"img": "resources/mia.jpg",
 		"paragraphs": [{
-			"para": ""
+			"para": "It is a great privilege and honor to serve as your SGA Treasurer for the 2018-19 school year. Last year, I served as treasurer of the class of 2020 and I will use my experience to accurately track SGA finances and budget funds responsibly. In tandem with my fellow officers, I hope to tackle many issues facing our school including (but of course, not limited to) course workloads, mental health/stress, and transparency and communication between the administration and the student body. Of course, I also want to ensure that fun TJ traditions like homecoming are successful and better than ever! Most importantly, I want to maintain an open line of communication with the entire student body, so that I can continue to accurately represent YOUR views. Together, I know we can make real change happen, so if you have any ideas, questions, or concerns, please don’t hesitate to reach out to me on messenger or by email (2020myang@tjhsst.edu)."
 		}]
 	},{
 		"title": "Secretary",