my updates
fixxed merge conflicts
Set up admin/ Updated all templates except home and about
My SOAP requests are broken
css changes html changes and image changes
Merged in CalebsBranch and fixed conflicts
Added my branch and fixed conflicts