Edited some HTML stuff
Merge branch 'master' of https://github.com/Sonictherocketman/Microblogger
fixed merge conflict