before the pull
fixed merge conflict in sudios show
changed .gitignore to ignore my gemfiles
added list of studios to user page. can only create studio if user viewing own profile
Merge branch 'master' into sarah_sprint6