merge
Merge branch 'work'

Conflicts:
	.bash_profile
merge
added WSAD direction keys for window placement