add comments possible
modify conflict
Merge pull request #23 from KimMinJeong/KMJ

Kmj
Merge branch 'master' of github.com:KimMinJeong/Collabo into board_main_contents

Conflicts:
	Board/templates/contents.html