Merge branch 'master' of https://github.com/freckie/Classroom-Reservation into master

@@ -3,8 +3,12 @@ An Web-based Classroom Reservation Service for Kyung Hee Univ.
 
 ## Maintainer
 - Myung-Hyun Kim ([Github](https://github.cmm/freckie))
-- Young-Min Ahn ([Github](https://github.com/ph-2))
+- Young-Min An ([Github](https://github.com/ph-2))
 
 ## Environment
+<<<<<<< HEAD
 - Google Cloud Platform
-- Google Apps Script
\ No newline at end of file
+- Google Apps Script
+=======
+(under development)
+>>>>>>> dc51dd9d3dfb4b5de20acc604b0f1da8fc38fd39