Github stuff might work maybe
Added Edit User page.
Authentication is go
merge conflict
merge conflicts and github login
conflict in routes
navbar signin link works
adding header links
Check out this custom form builder action
created blank show user page and linked with navbar
created search controller
Merge branch 'master2' of https://github.com/clabiak/ProgrammerMatcher into master2
created blank results page
created teams controller and added team link in navbar
Added Show page
Merge remote-tracking branch 'origin/master2' into master2

Conflicts:
	app/controllers/users_controller.rb
edited user show page
can create new team
created link to invite user to team
created requests controller