Merge pull request #456 from vaibhavcisin274/prachi

rails admin on heroku#28oct
Merge pull request #457 from vaibhavcisin274/prachi

rake file#28oct
#some changes in the master branch#29oct
changes in the project#30oct