Saving progress from work computer
Adding changes from Yahoo work computer
Merge branch 'master' of https://github.com/DerekLouie/backupfiles

Conflicts:
	Dotfiles/.bash_profile
	Dotfiles/.vimrc