Merge pull request #3 from empowerchris/chris

Chris
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.
Merge pull request #4 from empowerchris/chris

Deleted applications files.
changes
Merge pull request #5 from empowerchris/chris

Added home page, scholarship application form, and updated routes.
Many changes
Merge pull request #6 from empowerchris/sid

Sid
pushing changes to views so that I can merge master.
Merging branch with master.

ris

# 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.
Updated scholarships and students profiles.