Resolve Rakefile merge conflict
Resolve Rakefile merge conflict
Eric-Guo/website,mrjavascript/website,shama/website,AaronSikes/website,ktornwall/website,shearwater-intl/website,workmanw/ember-website,elwayman02/website,Eric-Guo/website,cyberkoi/website,kpfefferle/website,elwayman02/website,SaladFork/emberjs-website,SaladFork/emberjs-website,elidupuis/website,ktornwall/website,duggiefresh/website,wifelette/website,SaladFork/emberjs-website,MinxianLi/ember,zeppelin/emberjs-website,greyhwndz/website,wifelette/website,AaronSikes/website,balupton/ember-website,koriroys/emberjs-website,quangv/website,balupton/ember-website,ktornwall/website,koriroys/emberjs-website,workmanw/ember-website,rwjblue/website,kkenan/website,praxxis/website,josemarluedke/ember-website,bmac/website,shama/website,balupton/ember-website,bmac/website,josemarluedke/ember-website,mrjavascript/website,maczniak/emberjs,Nick-Cotter/aboutme,elidupuis/website,cyberkoi/website,tmock12/website,SaladFork/emberjs-website,raycohen/website,josemarluedke/ember-website,EricSchank/website,workmanw/ember-website,tmock12/website,maxcal/website,raycohen/website,greyhwndz/website,praxxis/website,datajohnny/website,knownasilya/website,quangv/website,quangv/website,davidpett/website,MinxianLi/ember,kpfefferle/website,maxcal/website,maczniak/emberjs,bmac/website,shearwater-intl/website,zeppelin/emberjs-website,mrjavascript/website,duggiefresh/website,jimmay5469/website,martndemus/website,workmanw/ember-website,datajohnny/website,duggiefresh/website,MinxianLi/ember,AgilionApps/website,zeppelin/emberjs-website,kkenan/website,bmac/website,elwayman02/website,AgilionApps/website,rwjblue/website,zeppelin/emberjs-website,datajohnny/website,tmock12/website,EricSchank/website,davidpett/website,martndemus/website,josemarluedke/ember-website,shearwater-intl/website,Nick-Cotter/aboutme,jimmay5469/website,raycohen/website,AaronSikes/website,EricSchank/website,kkenan/website,koriroys/emberjs-website,maxcal/website,jimmay5469/website,knownasilya/website,AgilionApps/website,greyhwndz/website,kpfefferle/website,martndemus/website,wifelette/website,cllns/emberjs-website,elidupuis/website,davidpett/website,cyberkoi/website,Eric-Guo/website,cllns/emberjs-website,cllns/emberjs-website