차트들 제목 만듬. 액티비티 바 크기 줄임.


카드 리스트 작업중
.apt_generated 삭제


카드리스트 완성
Merge branch 'master' into newmaster

Conflicts:
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/DoneFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/InProgressFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/MyWorksFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/ToDoFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/DoneFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/InProgressFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/MyWorksFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/ToDoFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/login/LoginActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/login/SignupActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/project/ProjectInvitationActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/project/ProjectSelectionActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/project/ProjectSelectionFragment_.java
이제 제대로 합쳐진 것 같은데, 이걸로 가죠

Merge remote-tracking branch 'origin/newmaster' into justin

Conflicts:
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/DoneFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/InProgressFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/MainActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/MyWorksFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/ToDoFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/DoneFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/InProgressFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/KanbanActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/MyWorksFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/ToDoFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/login/LoginActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/login/SignupActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/project/ProjectCreationActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/project/ProjectInvitationActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/project/ProjectSelectionActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/project/ProjectSelectionFragment_.java