"Working On Post"
Merge branch 'master' of github.com:stuycs-softdev/proj1-6

Conflicts:
	CCLL/templates/template.post.html