Added some things to the modal
Merge conflict fix
Merge pull request #46 from capms/profilepage

Profilepage