change pgsql pass
Merge branch 'jacky' of github.com:jacky5283/cwby2013 into jacky
added flag story functionality
renamed microposts to posts
Added private story field in story create form
added user approval for private stories
fix
Changed stories show layout
Changed recommended stories position
Added popover
Changed layout
Fix
Merge branch 'jacky' of github.com:jacky5283/cwby2013 into jacky
merged with jacky
fixed database
removed stuff
removed stuff
added image preview for stories