lzsxhrz4.a5b.txt

Merge branch 'master' of https://github.com/oh-iub-3/oh-iub-3.github.io

Conflicts:
	index.html
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	new file:   Thumbs.db
#	modified:   index.html
#