fixed what appeared to be a merge error in home.html and fixed indentation in my java files