Merge branch 'master' of github.com:KimMinJeong/Collabo into board_main_contents
Merge branch 'master' of github.com:KimMinJeong/Collabo into board_main_contents
-current_activation.html 추가
Merge branch 'master' of github.com:KimMinJeong/Collabo into board_main_contents
board_detail 색 `
board_deatil 색 디	ㅓ버그
ascii error
set_color error
unicode 추가 (board_main.py) --> set_color 돌아감
Merge branch 'master' of github.com:KimMinJeong/Collabo into board_main_contents
-set_color else 삭제
Merge branch 'master' of github.com:KimMinJeong/Collabo into board_main_contents

Conflicts:
	Board/Board_main.py
	Board/templates/contents.html
Merge pull request #43 from KimMinJeong/board_main_contents

Board main contents