gemfile
Merge branch 'master' into sid

/github.com/empowerchris/campusgenie into sid

# 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.
changes
Many changes
Merge pull request #6 from empowerchris/sid

Sid