just updated @ office
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	my-el-get.el
	my-python.el