commit index.html.swp
finished the new footer [issue 53]
Merge branch 'iss53'

asasdadasdad
aaaaaaa
Test Merge
update MyClass.java
Merge branch 'master' of https://github.com/dangnguyenhai/java_test_repo

Conflicts:
	MyClass.java