톰켓 팁
y
전체 커밋
Merge branch 'master' of https://github.com/nayha77/LifeUp.git

Conflicts:
	LifeUp/src/main/resources/Tip/LinuxTip.txt
git 오류 대처