.gitignore .rvmrc
Merge branch 'rails_girl' of https://github.com/ymzg/ymzg into rails_girl
create method new for cteating events
[yanjiao & haiyang]显示所有Event到index
new html and css file of yinxiuxing
merge rails_girl
create method new for cteating events
new stories folder
nothing change
create template for creating events
modified gemfile
t
[yanjiao & haiyang]修改index的页面，添加style
resolve conflict
add yingxiu trip story
add login.
suxu
add basic stories page
Merge branch 'rails_girl' of https://github.com/ymzg/ymzg into rails_girl
merge