migrate to jruby
Junk file
gitignore
Merge branch 'master' of github.com:ernest21/bilden

Conflicts:
	Gemfile
	Gemfile.lock
	README.rdoc
	app/assets/stylesheets/custume.css.scss
	app/controllers/admin/careers_controller.rb
	app/controllers/students_controller.rb
	app/controllers/uploads_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/models/career.rb
	app/models/student.rb
	app/models/user.rb
	app/views/users/_form.html.slim
	bin/bundle
	bin/rails
	bin/rake
	config/database.yml
	config/initializers/session_store.rb
	config/routes.rb
	config/secrets.yml
	db/migrate/20140706032552_create_users.rb
	db/schema.rb
	lib/pdf_process/pdf_helper.rb
	lib/pdf_process/process.rb
Merge migrate