# deleted javascripts by mistake. OOPS!
# copy secure secret_token.rb
Merge branch 'master' into production