j

.classpath

@@ -15,4 +15,4 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
-</classpath>
+</classpath>

.project

@@ -10,6 +10,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
@@ -28,8 +38,10 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.buildship.core.prefs

@@ -1,2 +1,2 @@
-connection.project.dir=
-eclipse.preferences.version=1
+connection.project.dir=
+eclipse.preferences.version=1

.settings/org.eclipse.wst.common.component

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+	<wb-module deploy-name="RaiderPlanner.git">
+		<property name="context-root" value="RaiderPlanner.git"/>
+		<wb-resource deploy-path="/WEB-INF/classes" source-path="src"/>
+	</wb-module>
+</project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+	<fixed facet="jst.java"/>
+	<fixed facet="jst.web"/>
+	<installed facet="jst.web" version="2.4"/>
+	<installed facet="jst.java" version="1.8"/>
+</faceted-project>

.travis.yml

@@ -1,4 +1,5 @@
 language: java
+dist: trusty
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
@@ -16,4 +17,3 @@ notifications:
 branches:
   except:
   - "/^.*-dev/"
-

AUTHORS

@@ -13,35 +13,45 @@ Fahad Alnashwan <alnashwan.2@wright.edu>
 Matthew Barrett <barrett.77@wright.edu>
 Gage Berghoff <berghoff.2@wright.edu>
 Aashish Bharadwaj <aashish.bharadwaj01@gmail.com>
+Daniel Bleigh <bleigh.2@wright.edu>
 Alena Brand <brand.18@wright.edu>
 Nathaniel C Crossman <crossman.4@wright.edu>
 Gabriel Dodds <dodds.26@wright.edu>
+Nathan Dunn <dunn.113@wright.edu>
+Josh Ehlinger <ehlinger.5@wright.edu>
+Elizabeth Farr <farr.16@wright.edu>
 Randy Forte <forterandy@outlook.com>
+Nathan Griffith <griffith.101@wright.edu>
 Aaron Hammer <hammer.21@wright.edu>
 Dominick Hatton <hatton.24@wright.edu>
 Peter Haviland <haviland.4@wright.edu>
 Rachel Hill <hill.382@wright.edu>
 Andy Hulett <hulett.4@wright.edu>
+William Kiger <kiger.9@wright.edu>
 Ryan Koeller <koeller.8@wright.edu>
 James Languirand <languirand.2@wright.edu>
 Eric Levine <levine.15@wright.edu>
 Amanda McCollum <mccollum.29@wright.edu>
 Ian Mahaffy <mahaffy.2@wright.edu>
+Bryten Jones <jones.1310@wright.edu>
 Don Miller <miller.189@wright.edu>
 Cole Morgan <morgan.272@wright.edu>
 Rafael Nunez <nunez.6@wright.edu>
+Tyler Palcic <palcic.4@wright.edu>
 Michael Plymire <plymire.2@wright.edu>
 Cameron Roudebush <roudebushcameron@gmail.com>
 Roberto C. Sánchez <roberto.sanchez@wright.edu>
 Eric Sweet <sweet.22@wright.edu>
 Nguyen Vo <vo.8@wright.edu>
 Amila Dias <asdtech153@live.com>
 Katherine Lemmert <katlemmert001@gmail.com>
+Ashley Reese <irish.4@wright.edu>
 Nathan Schroer <schroer.14@wright.edu>
 Hayden Richter <richter.20@wright.edu>
 Joshua Shaw <shaw.150@wright.edu>
 Ian Smith <smith.1903@wright.edu>
 Jacob Smith <smith.2198@wright.edu>
+Sierra Sprungl <sprungl.2@wright.edu>
 Clayton D. Terrill <terrill.22@wright.edu>
 Spencer Tracy <tracy.29@wright.edu>
 Sara Walsh <uglypurses@yahoo.com>
@@ -50,4 +60,4 @@ Alexander Voultos <voultos.2@wright.com>
 Sara Walsh <uglypurses@yahoo.com>
 Isaiah Winfrey <winfrey.5@wright.edu>
 Joseph Yancey <yancey.14@wright.edu>
-Adam Cone <cone.14@wright.edu>
+Adam Cone <cone.14@wright.edu>

README.md

@@ -1,14 +1,14 @@
 # RaiderPlanner
 #### The best study planner since the Gantt Diagram
 
-Please have a look at the [project website](https://rsanchez-wsu.github.io/RaiderPlanner) for information about RaiderPlanner.
+Please have a look at the [project website](https://rsanchez-wsu.github.io/RaiderPlanner)(old website) for information about RaiderPlanner.
 
 If you would like to contribute to RaiderPlanner, then please read about configuring the [development toolchain](TOOLCHAIN.md) and then read the [contributor guidelines](CONTRIBUTING.md).
 
 
 | Branch  | Build status  |
 | ------------- | ------------- |
-| rsanchez-wsu/master: | [![Build Status](https://api.travis-ci.org/rsanchez-wsu/RaiderPlanner.svg?branch=master)](https://travis-ci.org/rsanchez-wsu/RaiderPlanner)  |
+| gzdwsu/master: | [![Build Status](https://api.travis-ci.org/gzdwsu/RaiderPlanner.svg?branch=master)](https://travis-ci.org/gzdwsu/RaiderPlanner)  |
 
 
 

StudyProfiles/HP_First_Year.xml

@@ -144,7 +144,7 @@
         </timetableEventTypes>
     </assets>
     <studyProfile>
-        <name>First year Gryffindor</name>
+        <name>First Year Gryffindor</name>
         <details>1 September 2017 to 31 December 2017</details>
         <uid>HP_2017_1</uid>
         <year>2017</year>

StudyProfiles/StudyProfile_2018_SPRING.xml

@@ -171,7 +171,7 @@
         </timetableEventTypes>
     </assets>
     <studyProfile>
-        <name>2018 Spring semester</name>
+        <name>2018 Spring Semester</name>
         <details>24 April 2018 to 19 May 2018</details>
         <uid>SEMESTER_2018_1</uid>
         <year>2018</year>

StudyProfiles/corrupted_update.xml

@@ -95,6 +95,6 @@
             <email>anthony.bagnall@myspace.com</email>
             <familyNameLast>true</familyNameLast>
         </person>
-    </updates>
+    </updatesbad>
     <new></new>
 </hubfile>