- added some aliases and functions...
Merge remote-tracking branch 'github/master'

Conflicts:
	.bash_profile
	.functions

- Updated bash profile merge conflict
- Updated aliass merge conflict