completed faq; added Alex to footer
resolved conflicts