# 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
# Changes to be committed:
#
#	modified:   .gitignore
#	new file:   README.md
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.cache
#	.classpath
#	.idea/
#	.project
#	README
#	amba.mp4
#	gopro-tool-model.als
#	project/
#	uml/