small changes
xmonad web layout changes
Merge branch 'master' into purdue

Conflicts:
	rc/.xmonad/xmonad.hs