.
.
Merge branch 'master' into working_branch
working on index layout
 mergin master into feature branch
merging
merge msaater
fix conflicts
fixed travis thing
Merge branch 'master' into working_branch

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
Merge pull request #51 from eugenefilimonov/working_branch

Working branch