work:fixed markup and placed to the application.html.erb file and left inputs in index.html.erb
Added git scaffold and fixed test unit so it runs now
Edited routes.rb file so form on apply page renders
Merge branch 'master' of github.com:sparkbox/apprentice-application into test
working my way around views and styling them
Fixed conflicts
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'
Fixed merge conflict for schema.rb