Fetching set up for URL and Video form
Merge branch 'master' of github.com:stevemcquaid/cmunity

Conflicts:
	config/routes.rb
Fixed membership join bug
Merge pull request #32 from stevemcquaid/sean

Sean
Twilio fix
Twilio fix attempt 2
Twilio fix 3
Merge branch 'steve' into master2
added edit forms
Merge branch 'steve' of github.com:stevemcquaid/cmunity
attempts at adding vegas - javascript error can't find $
fixed bug with twilio
crashed site
UPDATED GROUP SHOW for current memmbers able to edit, delete. also removed my events and my posts from the dropdown
removed my groups from default groups index page
design changes
fixed broken links on home page temporarily
Merge branch 'master' into sean

Conflicts:
	app/views/groups/show.html.erb
resolved merge conflicts