fixed calendar
Merge branch 'master' of https://github.com/neelbhat88/wcsf
added paperclip and amazon s3 photo upload capability
added big goal, why, and how descriptions to the profile and edit profile pages.
further enhancements to profile page. Redirect back to profile page from edit page.
added update picture feature on edit profile page
Added college and college picture. Changed student info to user_info model.
updated profile styling
made profile only visible for students
Merge branch 'ryan'
merged master with ryan branch