prepared for heroku
can edit profile
profile show
solved cconflicts
routes conflicts solved
Merge pull request #25 from tomsword/profile-editing-creation

Profile editing creation