Added git scaffold and fixed test unit so it runs now
Merge branch 'master' of github.com:sparkbox/apprentice-application into test
Fixed merge conflict
Fixed merge conflict in schema.rb
Merge branch 'welcome-form-fields'
Fixed merge conflict for schema.rb