Needed to merge??? Confused
Merge branch 'master' of https://github.com/kacxdak/resume-online
Added profile changes (controller for profile, profile_form view, and added functions in membership_model)