fix git merge command

On branch master
Changes to be committed:

	modified:   init.sh
	modified:   scripts/middleman.sh
add _km.lib and move functions to it

On branch master
Changes to be committed:

	new file:   _km.lib
	modified:   init.sh
	modified:   scripts/middleman.sh
	modified:   scripts/server_ssh.sh
	modified:   setup.sh
add includes directory

On branch master
Changes to be committed:

	renamed:    _km.lib -> includes/_km.lib
change chmod u+x to chmod +x

On branch master
Changes to be committed:

	modified:   README.md
	modified:   includes/_km.lib
	modified:   setup.sh
update _km.lib
utilize [FILE] option of grep command

On branch master
Changes to be committed:

	modified:   init.sh
	modified:   scripts/aliases.sh
	modified:   scripts/firewalld.sh
	modified:   scripts/lemp.sh
	modified:   scripts/linux_update.sh
	modified:   scripts/middleman.sh
	modified:   scripts/nginx_config.sh
	modified:   scripts/server_ssh.sh
	modified:   scripts/swap.sh
	modified:   setup.sh
	modified:   sudoers.sh
centralize duplicate code into function library

On branch master
Changes to be committed:

	modified:   .gitignore
	modified:   init.sh
	modified:   scripts/lemp.sh
	modified:   scripts/linux_update.sh
	modified:   scripts/middleman.sh
	modified:   scripts/wordpress_install.sh
	modified:   setup.sh
update _libkm
rename _km.lib to km.lib
simplify usage instructions in README

On branch master
Changes to be committed:

	modified:   README.md
	renamed:    includes/_km.lib -> includes/km.lib
	modified:   init.sh
	modified:   setup.sh
move duplicate code into function library
rename wordpress_install.sh

On branch master
Changes to be committed:

	modified:   includes/km.lib
	modified:   init.sh
	modified:   scripts/middleman.sh
	renamed:    scripts/wordpress_install.sh -> scripts/wordpress.sh
	modified:   setup.sh
move more duplicate code to function library

On branch master
Changes to be committed:

	modified:   init.sh
	modified:   scripts/middleman.sh
	modified:   setup.sh
update km.lib
rename km.lib to linuxkm.lib

On branch master
Changes to be committed:

	renamed:    includes/km.lib -> includes/linuxkm.lib
	modified:   init.sh
	modified:   setup.sh
add gitkm.lib
update libraries

On branch master
 Changes to be committed:

	modified:   includes/gitkm.lib
	modified:   includes/linuxkm.lib
move duplicate code to function library
edit code to source libraries

On branch master
Changes to be committed:

	modified:   init.sh
	modified:   scripts/aliases.sh
	modified:   scripts/lemp.sh
	modified:   scripts/server_ssh.sh
	modified:   setup.sh
move SSH code to function library

On branch master
Changes to be committed:

	modified:   includes/gitkm.lib
	modified:   includes/linuxkm.lib
	modified:   scripts/server_ssh.sh
	modified:   scripts/wordpress.sh
	modified:   setup.sh
fix curl commands
add ssh_dir to gen_ssh_keys function calls

On branch master
Changes to be committed:

	modified:   README.md
	modified:   init.sh
update function locate_repos

On branch master
Changes to be committed:

	modified:   includes/linuxkm.lib
	modified:   init.sh
	modified:   setup.sh
update function library and add message for user to select account for repos

On branch master
Changes to be committed:

	modified:   includes/linuxkm.lib
	modified:   init.sh
	modified:   setup.sh