Merge pull request #60 from windyarts/mnd-campaign-131223

M&D campaign for xmas
 add join/login.html
Merge pull request #61 from leplay/master

 add join/login.html
Fucking UBI