Merge branch 'development'
Merge branch 'development'
Added config status to application rb
Updated app rb file
Switched css and js file on application.html.erb
Merge branch 'master' into development