formatted html, css, and js files
more formatting
fixed merge conflicts
adding social sharing
fixed merge conflicts
commit stuff again...
fixed some javascript errors
fixed merge conflicts
art photo fixed and uploading
fixed commit issues
fixed event photos, changed routes
fixes john's crap