fixed naming issue in YAML file
added profile partial and logic to switch between pro/reg users
Merge pull request #26 from bumblebees-2014/user_show

added profile partial and logic to switch between pro/reg users
Merge pull request #25 from bumblebees-2014/seed_fixes

fixed naming issue in YAML file
created table display for ticket objects, only shown if on your own profile
mergin stuff
Merge branch 'master' of https://github.com/bumblebees-2014/full_massive_laser
updates to ticket partial
merging with new commits
merging with master
Merge branch 'ticket_dash'
added ability to edit profile bio as a professional
Merge pull request #28 from bumblebees-2014/profile_crud

added ability to edit profile bio as a professional
updates to profile page and user's ticket table, welcome#index with logo
Add working oauth for google
-NOTE: need to refactor to eliminate traditional login and user creation
-Need to add user update form
Merge remote-tracking branch 'origin/master' into ticket_partial

Conflicts:
	Gemfile.lock
	app/.DS_Store
	app/controllers/users_controller.rb
	config/routes.rb
update previous push to have Ruby version 2.0.0
fixed merge conflicts
Merge pull request #30 from bumblebees-2014/oauth_works2

Oauth works2
fixed user show page
fixed merge conflicts