teams are now only nested under users
fixed path to user/teams #show
Merge branch 'master' of github.com:tjalil/ThinkFit.Me

Conflicts:
	config/routes.rb
change the user_id to alias owner_id for teams association, to seperate it from the user members to come
created the join_team_user table and updated their models with associations
forgot to add the HABTM  association to the team model
users can join a group by pressing a button, no display
add user to Team-join table if not already in it
fixed issue with join redirect by redirecting to same page,b ut missing an error
added commentables variable to form
cleaned up formatting and random @commentable issues
Merge branch 'master' of github.com:tjalil/ThinkFit.Me
Merge branch 'owner_alias'

Conflicts:
	db/schema.rb
added notice and alert when user presses join button
changed to owner username not id and added divs around description and comments