fix confilict 2
Merge branch 'master' of github.com:aycheh/micropost_app