Base profile page completed - user can see list of recent badges and all badges awarded
User can update profile - name, email, and password
Added additional tests for edit profile form and changed redirect after user changes profile information
Merge branch 'front-end' into profile-page
First draft of CSS for profile page
Added additional feature tests and fixed minor CSS issues
Fixed minor conflict merge issue