renamed app.rake to scheduler.rake
pulled & fixed conflicts
'pulled before merging branch into master'