commit!
Merge branch 'beta_1' of https://github.com/AweKyle/my_blog into beta_1