Add mark
Ad marks
Merge branch 'master' of http://github.com/javonharper/dotfiles

Conflicts:
	bash_aliases