styling
ability to upload a profile picture
fixed routing errors and styling
merge conflict
add a show button for the webcam
webcam boom boom
fix merge conflicts
Merge branch 'development' of github.com:tmerlet/Photoapp into development
fixed conflicts
some small amends