test some stuff
Merge branch 'master' of https://github.com/mackerl/config
corrected conflicts
Conflicts:
	.bash_aliases