Created two blank test files
merge commit
merge commit
fixed merge conflict
merge
Merge pull request #5 from mlee284045/mike

Mike
adding changes after mikes disaster :) :) :)
Merge pull request #6 from mlee284045/miguel

adding changes after mikes disaster :) :) :)
adding home page
Merge pull request #7 from mlee284045/miguel

adding home page
added sidebar frame
fixed merge issue home.html