Twelfth Commit

Started the upload method. Fixed logout. Implemented Mc2 and updated
some html. Need to finish programming question and style. Tomcat not
working on mac.