delete yourub
fix gemfile space
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
merge conflict
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
Merge branch 'master' of github.com:ericodes/PickleSong
add render partial to welcome index