ffalfjalfjlaj
a
fafaster' of https://github.com/wjiangcmu/newGitTest

Conflicts:
	index.html
	index2.java