Merge branch 'master' of https://github.com/nicknish/opinionation

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/nicknish/opinionation

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
m
going to try a new approach. stopping create and destroy actions from happening for users not logged in"
added if else redirect to users new
a
gottsta merge
fixed merge issues in posts#index
infinite scroll added