pull check
push test
Merge pull request #2 from im11041991/master

push test
Merge pull request #1 from AdrianMLin/master

added erd, changed server, changed models
updated <models.rb> associations