Merge branch 'whitespace-dev' into template-markup
gotta have a head to have style
style from on high
Merge branch 'style' into dev
Merge branch 'style' into whitespace-dev

Conflicts:
	chat/templates/chat/chatmessage_list.html
Merge branch 'master' into whitespace

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

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