Edited routes.rb file so form on apply page renders
working my way around views and styling them
Fixed merge conflict
Fixing conflicts with master
Fixing conflict in application.html
Deleted duplicate files with wrong names
Fixed merge conflict in schema.rb
Updated table name in welcome controller
Merge branch 'welcome-form-fields'