table view as a default
Merge pull request #15 from Ragnarson/github_auth

#13 Ability to sign in without GitHub account
sign up link styling
Merge pull request #30 from Ragnarson/sign_up_styling

sign up link styling
Merge pull request #27 from Ragnarson/issue#26

table view as a default
#25 Added vacations
Merge pull request #32 from Ragnarson/add_vacations

#25 Added vacations
membership problem fix
Merge pull request #31 from Ragnarson/issue#29

membership problem fix
renaming destroy link
Merge pull request #36 from Ragnarson/destroy_link

renaming destroy link
#33 Integration with Google Calendar
Merge pull request #37 from Ragnarson/add_vacations

#33 Integration with Google Calendar
fork update
Updated fork
Updated fork
Merge branch 'add_vacations' of github.com:Ragnarson/people into Ragnarson-add_vacations

Conflicts:
	Gemfile
	app/views/available_users/index.html.haml
	spec/features/teams_spec.rb
	spec/spec_helper.rb
Fixed tests
Merge branch 'add_vacations' of github.com:Ragnarson/people into Ragnarson-add_vacations
Merge branch 'master' into Ragnarson-add_vacations