Fixed the dropdown, add py~ into gitignore
fixed merge of base.html