edit profile
Merge branch 'master' of github.com:straywithsmile/work_conf

Conflicts:
	bash_profile
add syntax