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

Updated views.