Add/edit functions added
Merge branch 'master' of https://github.com/wmorgan85/assassin

Conflicts:
	.bash_history