i- #16 and #17klklklklklklklklklklklklklklklklklklklkDkD:wq:w:wq kb!:x:x!:q!
added chair (#16, #17)
Merge branch 'develop-ak' of https://github.com/tkowark/hpi-hiwi-portal into develop-ak

commit message of 2d51f1e708e8f66490ad371b5cb75d1f544125e0 was brocken
included gem openid-authenticable
merged develop branch
User model changes and annotate gem > bundle install
Working open id login with hacked email
User und Chai tests
open_id data retrieval
Merge pull request #23 from tkowark/develop-ak-openid

Develop ak openid
add association between chair and user model
added tests for chair
Merge branch 'develop-ak' of https://github.com/tkowark/hpi-hiwi-portal into develop-ak
Information check after login and user update
Checkbox for students
added logout, login and edit profile links to navbar
Merge pull request #24 from tkowark/develop-ak

ak-sprint-1
Merge pull request #25 from tkowark/develop

Sprint 1 - Team AK
fixed wrong path to profile causing the application to crash whenever i tried to log in
Merge remote-tracking branch 'origin/master' into develop-ja

Conflicts:
	.gitignore
	Gemfile.lock
	config/routes.rb
	db/schema.rb