Added preliminary merge buttons. They don't do anything yet, but the basic styling is there. I will probably change it later though.
Added preliminary merge buttons. They don't do anything yet, but the basic styling is there. I will probably change it later though.

Macainian/Django-Maced,Macainian/Django-Maced,Macainian/Django-Maced