Merged conflicts about membership removal.

constitution.tex

@@ -105,10 +105,43 @@ George Mason University}
   infrastructure as required by their project, and as overseen by the
   System Administrator. Additionally, project management entails the
   responsibility to maintain project documentation and oversee project
-  development. Developers may also contribute to SRCT projects under
-  the guidance and supervision of the project manager.
-  
-  \subsection{Revocation of Developer Status}
+  development. Developers may also contribute to SRCT projects under 
+  the guidance and supervision of the project manager. To attain 
+  developer status, a contributor must demonstrate leadership skills, 
+  commitment to SRCT principles, and technical ability. Prospective 
+  developers will be selected based on these qualifications by official 
+  vote. Any prospective developer will not be voted on more than twice 
+  per semester.
+  Any developer who leaves the university, whether by graduating or otherwise,
+  loses their developer status. Developers who graduate automatically become
+  alumni members. Developers who leave the university without graduating
+  do not automatically gain alumni status, but may request alumni status
+  from the Executive Board, who will decide the matter by a majority vote.
+  Developers who are expelled lose their developer status and may not request
+  alumni status.
+  \\ \\
+  The following categories, \textbf{alumni members} and
+  \textbf{honorary members}, are special categories of membership. The
+  purpose of these categories is to allow non-GMU people to contribute to
+  SRCT. Members of these categories shall be listed as members, but will
+  not be counted in membership totals, and will not count as "Members" when
+  this document refers to such.
+
+  \subsection{Alumni Members}
+  Alumni members are former developers or contributors who graduated
+  from George Mason in good standing with SRCT. They may contribute to
+  projects and offer advice, but they may not vote, hold leadership
+  positions, or control SRCT resources.
+
+  \subsection{Honorary Members}
+  Honorary members are people who have been recognized for providing
+  significant service, expertise, or other contributions to SRCT. They
+  may be nominated by any contributor or developer and must be approved
+  by a majority vote of the Executive Board. They may contribute to projects
+  and offer advice, but may not vote, hold leadership positions, or control
+  SRCT resources.
+
+  \subsection{Revocation of Membership}
   In extraordinary circumstances, if a motion is brought and seconded at 
   a meeting for revocation of a developer's status, the SRCT general membership
   will be notified by email of the motion not less than five days before the