Add default email and password
Add back secret_token and gemfile.lock
Merge remote-tracking branch 'heroku/master'
remove email and password
Merge branch 'master' of heroku.com:musickids
stupid indentation error