whitespace
Merge branch 'whitespace' into template-markup
Merge branch 'template-markup' into prod

Conflicts:
	chat/templates/chat/chatmessage_list.html
template whitespace
Merge branch 'whitespace' into template-markup
Merge branch 'template-markup' into prod

Conflicts:
	chat/templates/chat/chatmessage_list.html
indentation
Merge branch 'whitespace' into template-markup
Merge branch 'template-markup' into prod

Conflicts:
	chat/templates/chat/chatmessage_list.html
indentation
Merge branch 'whitespace' into template-markup
Merge branch 'template-markup' into prod

Conflicts:
	chat/templates/chat/chatmessage_list.html
whitespace
Merge branch 'whitespace' into template-markup
Merge branch 'template-markup' into prod

Conflicts:
	chat/templates/chat/chatmessage_list.html
this commit is erroneous, but I'll fix it soon
Merge branch 'whitespace' into template-markup
Merge branch 'template-markup' into prod

Conflicts:
	chat/templates/chat/chatmessage_list.html
okay, fixed that; just a little more whitespace to correct
Merge branch 'whitespace' into template-markup