nur das Dokument geöffnet. Keine Codeänderung
added capybara gem + updated spec_helper
added studentsearch
added studentsearch
Merge pull request #20 from ephe-meral/add-gem-capybara

Added capybara gem + updated spec_helper to use it
added factorygirl gem + updated spec_helper
added missing Gemfile.lock
Merge pull request #22 from ephe-meral/add-gem-factory-girl

Added factorygirl gem + updated spec_helper
Merge branch 'develop-js-student-profile' of https://github.com/tkowark/hpi-hiwi-portal into develop-js
Merge branch 'develop-js-studentsearch' of https://github.com/tkowark/hpi-hiwi-portal into develop-js
#student profile: added file upload for cv. felix&frank
Merge remote-tracking branch 'origin/develop' into develop-js-student-profile

Conflicts:
	Gemfile
	Gemfile.lock
updated Gemfile for merging
#student profile: fixed text fields in tests
Merge remote-tracking branch 'origin/develop-js-filtersearch' into develop-js-student-profile

Conflicts:
	Gemfile
	Gemfile.lock
updated gemfile
fixed studentsearch test
new student model test
small update of schema file