Merge branch 'master' of https://github.com/Mauraders/web into user_profile
Merge branch 'master' of https://github.com/Mauraders/web into user_profile
Merge branch 'master' of https://github.com/Mauraders/web into user_profile
added startdate, enddate and also income.
changed annual_pay, start_date and end_date in user_profile/models.py
added Pillow library to web/requirements.txt
added and commented out the 'profile_pic' field of the user_profile/models.py
added pp.png image to web/user_profile
created media/profile_images file and stored 'pp.png' in media/profiles_images
changed the profile_pic in web/user_profile/models.py and binded the default image as pp.png in media/profile_images
Merge pull request #9 from Mauraders/user_profile

User profile