added user profile
updated users index page
working on devise
solved merge conflict