Append a number to the filename if it already exists
Merge branch 'dupe_filename' of https://github.com/brockboland/Jekyll-Post-Automaters into brockboland-dupe_filename

Conflicts:
	scripts/blog-post.rb
	scripts/link-post.rb
	scripts/video-post.rb
Merge branch 'brockboland-dupe_filename'

push origin master

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
t:quit
dkdldjldkj

ajdldijo# the commit.:q
end
END
Qq

q

git commit -m "merg"

:wq
:q