Added API method for joining teams
Merge branch 'master' of https://github.com/jballen/running_site

Conflicts:
	config/routes.rb
Added API function join team