Fixed changelog merge.
Fixed changelog merge.

Signed-off-by: Joshua Peek <c028c213ed5efcf30c3f4fc7361dbde0c893c5b7@joshpeek.com>

88rabbit/newRails,MSP-Greg/rails,untidy-hair/rails,joonyou/rails,kmcphillips/rails,palkan/rails,joonyou/rails,MichaelSp/rails,amoody2108/TechForJustice,tgxworld/rails,vipulnsward/rails,Edouard-chin/rails,rossta/rails,yawboakye/rails,maicher/rails,illacceptanything/illacceptanything,flanger001/rails,gavingmiller/rails,prathamesh-sonpatki/rails,pvalena/rails,Stellenticket/rails,gfvcastro/rails,voray/rails,gfvcastro/rails,mathieujobin/reduced-rails-for-travis,riseshia/railsguides.kr,mohitnatoo/rails,matrinox/rails,gauravtiwari/rails,georgeclaghorn/rails,bradleypriest/rails,fabianoleittes/rails,esparta/rails,matrinox/rails,prathamesh-sonpatki/rails,travisofthenorth/rails,arjes/rails,MSP-Greg/rails,illacceptanything/illacceptanything,Erol/rails,Sen-Zhang/rails,yasslab/railsguides.jp,bogdanvlviv/rails,Sen-Zhang/rails,schuetzm/rails,kachick/rails,tijwelch/rails,baerjam/rails,shioyama/rails,vipulnsward/rails,aditya-kapoor/rails,eileencodes/rails,tjschuck/rails,Spin42/rails,illacceptanything/illacceptanything,mtsmfm/rails,betesh/rails,bolek/rails,baerjam/rails,esparta/rails,kddeisz/rails,utilum/rails,yahonda/rails,georgeclaghorn/rails,mijoharas/rails,aditya-kapoor/rails,amoody2108/TechForJustice,illacceptanything/illacceptanything,bradleypriest/rails,prathamesh-sonpatki/rails,marklocklear/rails,vassilevsky/rails,jeremy/rails,88rabbit/newRails,assain/rails,Stellenticket/rails,kmcphillips/rails,illacceptanything/illacceptanything,yahonda/rails,vassilevsky/rails,EmmaB/rails-1,aditya-kapoor/rails,kaspth/rails,kirs/rails-1,kamipo/rails,shioyama/rails,hanystudy/rails,illacceptanything/illacceptanything,brchristian/rails,deraru/rails,vipulnsward/rails,lucasmazza/rails,deraru/rails,Vasfed/rails,bolek/rails,voray/rails,notapatch/rails,EmmaB/rails-1,lcreid/rails,rbhitchcock/rails,kaspth/rails,Edouard-chin/rails,rossta/rails,Stellenticket/rails,yasslab/railsguides.jp,elfassy/rails,tgxworld/rails,kachick/rails,eileencodes/rails,baerjam/rails,tijwelch/rails,BlakeWilliams/rails,printercu/rails,kirs/rails-1,jeremy/rails,rafaelfranca/omg-rails,rbhitchcock/rails,koic/rails,felipecvo/rails,88rabbit/newRails,illacceptanything/illacceptanything,pvalena/rails,utilum/rails,riseshia/railsguides.kr,kmayer/rails,notapatch/rails,illacceptanything/illacceptanything,rails/rails,flanger001/rails,richseviora/rails,koic/rails,esparta/rails,gfvcastro/rails,BlakeWilliams/rails,palkan/rails,gavingmiller/rails,lucasmazza/rails,printercu/rails,sergey-alekseev/rails,gauravtiwari/rails,illacceptanything/illacceptanything,illacceptanything/illacceptanything,xlymian/rails,fabianoleittes/rails,mtsmfm/railstest,sealocal/rails,riseshia/railsguides.kr,notapatch/rails,sergey-alekseev/rails,richseviora/rails,Stellenticket/rails,fabianoleittes/rails,fabianoleittes/rails,hanystudy/rails,notapatch/rails,utilum/rails,samphilipd/rails,illacceptanything/illacceptanything,BlakeWilliams/rails,joonyou/rails,rails/rails,bogdanvlviv/rails,Erol/rails,alecspopa/rails,georgeclaghorn/rails,yhirano55/rails,starknx/rails,yawboakye/rails,pvalena/rails,bogdanvlviv/rails,yawboakye/rails,eileencodes/rails,lucasmazza/rails,prathamesh-sonpatki/rails,sergey-alekseev/rails,untidy-hair/rails,mijoharas/rails,felipecvo/rails,maicher/rails,kenta-s/rails,deraru/rails,coreyward/rails,yasslab/railsguides.jp,alecspopa/rails,baerjam/rails,rails/rails,elfassy/rails,tgxworld/rails,rafaelfranca/omg-rails,matrinox/rails,xlymian/rails,ttanimichi/rails,Vasfed/rails,Erol/rails,yhirano55/rails,flanger001/rails,yhirano55/rails,brchristian/rails,yalab/rails,pvalena/rails,schuetzm/rails,illacceptanything/illacceptanything,travisofthenorth/rails,Sen-Zhang/rails,kddeisz/rails,yahonda/rails,yahonda/rails,kamipo/rails,mijoharas/rails,utilum/rails,gavingmiller/rails,ngpestelos/rails,mohitnatoo/rails,repinel/rails,gfvcastro/rails,arjes/rails,starknx/rails,stefanmb/rails,richseviora/rails,Vasfed/rails,jeremy/rails,xlymian/rails,assain/rails,printercu/rails,assain/rails,aditya-kapoor/rails,ledestin/rails,kenta-s/rails,schuetzm/rails,bradleypriest/rails,BlakeWilliams/rails,mohitnatoo/rails,MSP-Greg/rails,kmcphillips/rails,kddeisz/rails,bogdanvlviv/rails,yawboakye/rails,alecspopa/rails,kachick/rails,coreyward/rails,mtsmfm/railstest,kddeisz/rails,stefanmb/rails,gcourtemanche/rails,samphilipd/rails,kaspth/rails,felipecvo/rails,arunagw/rails,EmmaB/rails-1,samphilipd/rails,illacceptanything/illacceptanything,yalab/rails,rbhitchcock/rails,yalab/rails,Edouard-chin/rails,lcreid/rails,starknx/rails,tjschuck/rails,riseshia/railsguides.kr,brchristian/rails,illacceptanything/illacceptanything,maicher/rails,gcourtemanche/rails,betesh/rails,mechanicles/rails,mechanicles/rails,vassilevsky/rails,kmcphillips/rails,kamipo/rails,jeremy/rails,georgeclaghorn/rails,Envek/rails,tijwelch/rails,repinel/rails,pschambacher/rails,palkan/rails,ledestin/rails,rails/rails,pschambacher/rails,eileencodes/rails,MichaelSp/rails,rossta/rails,kmayer/rails,mtsmfm/rails,betesh/rails,stefanmb/rails,lcreid/rails,schuetzm/rails,illacceptanything/illacceptanything,mathieujobin/reduced-rails-for-travis,rafaelfranca/omg-rails,ttanimichi/rails,ttanimichi/rails,yalab/rails,marklocklear/rails,Envek/rails,deraru/rails,repinel/rails,betesh/rails,mechanicles/rails,tjschuck/rails,ngpestelos/rails,pschambacher/rails,tgxworld/rails,tjschuck/rails,ledestin/rails,gcourtemanche/rails,kmayer/rails,odedniv/rails,yhirano55/rails,odedniv/rails,mathieujobin/reduced-rails-for-travis,ngpestelos/rails,Edouard-chin/rails,odedniv/rails,shioyama/rails,printercu/rails,elfassy/rails,palkan/rails,mohitnatoo/rails,arunagw/rails,iainbeeston/rails,arjes/rails,lcreid/rails,MichaelSp/rails,shioyama/rails,voray/rails,mechanicles/rails,mtsmfm/railstest,bolek/rails,assain/rails,sealocal/rails,vipulnsward/rails,joonyou/rails,mtsmfm/rails,iainbeeston/rails,Erol/rails,yasslab/railsguides.jp,esparta/rails,Envek/rails,amoody2108/TechForJustice,iainbeeston/rails,coreyward/rails,iainbeeston/rails,gauravtiwari/rails,Spin42/rails,travisofthenorth/rails,koic/rails,arunagw/rails,sealocal/rails,flanger001/rails,hanystudy/rails,untidy-hair/rails,repinel/rails,Vasfed/rails,untidy-hair/rails,arunagw/rails,marklocklear/rails,kenta-s/rails,MSP-Greg/rails,kirs/rails-1,Envek/rails,Spin42/rails,travisofthenorth/rails