으아아아
Merge branch 'master' of https://github.com/aster9725/aster9725private

Conflicts:

	CodeCompare/app/src/main/java/com/example/codecompare/app/CustomText.java

	CodeCompare/app/src/main/java/com/example/codecompare/app/MainActivity.java