refactoring
Merge pull request #5 from ajkl/version_0

refactoring
Merge branch 'master' of github.com:ajkl/researchorum

Conflicts:
	__init__.py