diff --git a/index.html b/index.html index 232946e2ff9a482545922ad29ce9eabe718313d9..acef5082e4a76fb5b481385d8fa06e64933b6e08 100644 --- a/index.html +++ b/index.html @@ -58,24 +58,34 @@ <section id="about" class="wrapper style2 fade-up"> <div class="inner"> <h2>Who we are</h2> - <p>The University of Waterloo Capture the Flag (CTF) Club provides a competitive, comfortable, and challenging space for those wishing to test their computer science and penetration testing skills and knowledge. We host competitions + <b>We have merged with the UWaterloo Cybersecurity Club!</b> + <p>The University of Waterloo Capture the Flag (CTF) Club provides a competitive, comfortable, and + challenging space for those wishing to test their computer science and penetration testing skills + and knowledge. We host competitions and workshops, and team up to participate in CTFs hosted by other organizations.</p> <div class="features"> <section> <span class="icon solid major fa-question"></span> <h3>What are CTFs?</h3> - <p>CTF competitions are a set of online challenges that are created to determine participant mastery of various tools, algorithms, and information. Participant abilities are determined by whether they are able to retrieve + <p>CTF competitions are a set of online challenges that are created to determine participant + mastery of various tools, algorithms, and information. Participant abilities are determined + by whether they are able to retrieve specific information, known as flags, from the challenge presented.</p> </section> <section> <span class="icon solid major fa-user-plus"></span> <h3>Can I participate?</h3> - <p>Of course! Even though some experience is always beneficial, everyone has to start somewhere, so we welcome beginners with 0 experience. You just need a laptop.</p> - <p>If you're interested, join us on our <a href="https://discord.gg/FbN6SsnkpH" target="_blank">Discord server</a> and subscribe to our <a href="https://lists.uwaterloo.ca/mailman/listinfo/ctf-club" target="_blank">mailing - list</a>. Don't worry, we don't spam. In fact, we haven't sent out a single email yet.</p> + <p>Of course! Even though some experience is always beneficial, everyone has to start somewhere, + so we welcome beginners with 0 experience. You just need a laptop.</p> + <p>If you're interested, join us on our <a href="https://discord.gg/KrTV4hjGWq" + target="_blank">Discord server</a> and subscribe to our <a + href="https://lists.uwaterloo.ca/mailman/listinfo/ctf-club" target="_blank">mailing + list</a>. Don't worry, we don't spam. In fact, we haven't sent out a single email yet. + </p> </section> <section> - <iframe src="https://discord.com/widget?id=772864526030471189&theme=dark" width="350" height="500" allowtransparency="true" frameborder="0" + <iframe src="https://discord.com/widget?id=802006885250629633&theme=dark" width="350" + height="500" allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe> </section> <section> @@ -83,10 +93,15 @@ <h3>Our policies</h3> <p><strong>Be nice!</strong><br>That's our only policy. This covers the following: <ul> - <li><strong>Be nice to people.</strong> Treat others as you would want to be treated. Respect people's property, whether physical or virtual. Do not harass anyone in any way.</li> - <li><strong>Be nice to computers.</strong> Do not misuse or abuse any software, hardware, services or anything else. Do not hack anything not specifically intended for you to hack. Do not (D)DoS anything, or otherwise + <li><strong>Be nice to people.</strong> Treat others as you would want to be treated. + Respect people's property, whether physical or virtual. Do not harass anyone in any way. + </li> + <li><strong>Be nice to computers.</strong> Do not misuse or abuse any software, hardware, + services or anything else. Do not hack anything not specifically intended for you to + hack. Do not (D)DoS anything, or otherwise prevent others from participating.</li> - <li><strong>Follow the rules.</strong> Follow any rules set out in our Discord server. Follow any rules and laws set out by contest organizers and governments.</li> + <li><strong>Follow the rules.</strong> Follow any rules set out in our Discord server. + Follow any rules and laws set out by contest organizers and governments.</li> </ul> </p> </section> @@ -105,11 +120,15 @@ <section id="contact" class="wrapper style4 fade-up"> <div class="inner"> <h2>Contact Us</h2> - <p>You can reach us at <a href="mailto:ctf@cs.uwaterloo.ca">ctf@cs.uwaterloo.ca</a>, or on our social media:</p> + <p>You can reach us at <a href="mailto:ctfclub@uwaterloo.ca">ctfclub@uwaterloo.ca</a>, or on our social + media:</p> <ul class="icons"> - <li><a href="https://twitter.com/uwaterloo_ctf" class="icon brands fa-twitter" target="_blank"><span class="label">Twitter</span></a></li> - <li><a href="https://discord.gg/FbN6SsnkpH" class="icon brands fa-discord" target="_blank"><span class="label">Discord</span></a></li> - <li><a href="https://git.uwaterloo.ca/ctf" class="icon brands fa-git" target="_blank"><span class="label">Git</span></a></li> + <li><a href="https://twitter.com/uwaterloo_ctf" class="icon brands fa-twitter" target="_blank"><span + class="label">Twitter</span></a></li> + <li><a href="https://discord.gg/KrTV4hjGWq" class="icon brands fa-discord" target="_blank"><span + class="label">Discord</span></a></li> + <li><a href="https://git.uwaterloo.ca/ctf" class="icon brands fa-git" target="_blank"><span + class="label">Git</span></a></li> </ul> </div> </section>