pull
merge resolved
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails
added get subreddit#show to routes
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails
subreddit form created
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails
subreddit form view displayed