some changes
fix bug
Merge branch 'master' of git@scm.readonphone.com:awesomescreenshot-website.git