merge conflict
Merge branch 'master' of https://github.com/ada10lgu/etsn05.git
fixed so only one person can be logged in at the time
Merge branch 'master' of https://github.com/ada10lgu/etsn05.git