add from file in home
Merge branch 'master' of https://github.com/angrysnail/workspace

Conflicts:
	python/modules/__init__.py