Merge with nazly
Merge pull request #3 from nazlysabbour/phase-1

minor changes
merge with usptream
merge with usptream
Adding carrerwave and image uploading
More updates
merge with upstream
upload photo for student
upload photo for student