Merge branch 'integration' into weighted-balancing

*~

*.o

*.so

*.cu_o

*.ptx

*_ptx.h

*.a

*.d

*.x

*.exe

*.dll

Obj_*

log.lammps

log.cite

*.bz2

*.gz

*.tar

.*.swp

*.orig

*.rej

.vagrant

.DS_Store

.DS_Store?

._*

.Spotlight-V100

.Trashes

ehthumbs.db

Thumbs.db

# Makefile for LAMMPS documentation

SHA1          = $(shell echo $USER-$PWD | sha1sum | cut -f1 -d" ")

SHA1          = $(shell echo $USER-$PWD | python utils/sha1sum.py)

BUILDDIR      = /tmp/lammps-docs-$(SHA1)

RSTDIR        = $(BUILDDIR)/rst

VENV          = $(BUILDDIR)/docenv

## Installing prerequisites

To run the documention build toolchain Python 3 and virtualenv have to be

installed. The following are instructions for common Linux distributions:

installed. Here are instructions for common setups:

### virtualenv

#### Ubuntu

### Ubuntu

```bash

sudo apt-get install python-virtualenv

```

#### Fedora

### Fedora

```

sudo yum install python-virtualenv

```

### MacOS X

## Python 3

Download the latest Python 3 MacOS X package from https://www.python.org and install it.

This will install both Python 3 and pip3.

## virtualenv

Once Python 3 is installed, open a Terminal and type `pip3 install virtualenv`. This will

install virtualenv from the Python Package Index.

  <H1></H1><div class="section" id="lammps-documentation">

<h1>LAMMPS Documentation</h1>

<div class="section" id="aug-2016-version">

<h2>20 Aug 2016 version</h2>

<h2>27 Aug 2016 version</h2>

</div>

<div class="section" id="version-info">

<h2>Version info:</h2>