profile 적용..
Merge branch 'master' of https://github.com/Nexters/WeStudy

Conflicts:

westudy/app/src/main/java/com/example/godong/westudy/Activity/StudyMainA
ctivity.java