Merge pull request #26 from CMU-17313Q/integrate-individual-changes

Integrate individual changes

README.md

@@ -10,13 +10,16 @@ NodeBB by itself contains a "common core" of basic functionality, while addition
 
 ### [Try it now](//try.nodebb.org) | [Documentation](//docs.nodebb.org)
 
+<<<<<<< HEAD
 ### Team Members
 + Abdallah Almana aalmana@andrew.cmu.edu
 + Abdulwahab Al-Rumaihi arumaihi@andrew.cmu.edu
 + Hiba Hamad hhamad@andrew.cmu.edu
 + Najoud Al-Talib ntalib@andrew.cmu.edu
 + Reem Kensouh rkensouh@andrew.cmu.edu
 
+=======
+>>>>>>> individual-fork/f24
 ## Screenshots
 
 NodeBB's theming engine is highly flexible and does not restrict your design choices. Check out some themed installs in these screenshots below: