committing additional changes - moved logo around
removes tmp files
resolves merge conflicts
adds membership and about us pages
Merge branch 'homepage'