Merge branch 'master' of github.com:leeping/etc
Merge branch 'master' of github.com:leeping/etc
Merge branch 'master' of github.com:leeping/etc
Merge branch 'master' of github.com:leeping/etc
Added shiftx2 to base bashrc
Merge branch 'master' of github.com:leeping/etc

Conflicts:
	bashrc