Initial commit
fix conflict
add trvis
ok
add pep8
change travis configure
fix config
Merge remote-tracking branch 'upstream/master' into wola

Conflicts:
	pip-req.txt