Update .gitignore
Create changelog.md
Update alpha.py
Update two_column_base.html
Merge pull request #2 from charlw/master

Changelog.md