language changes
Merge branch 'master' of https://github.com/LabAdvComp/Bionimbus
Merge branch 'master' of https://github.com/LabAdvComp/Bionimbus
use LIMS

use tracking sheet
use correct verbage
Merge branch 'master' of https://github.com/LabAdvComp/Bionimbus

think i resolved this conflict OK

Conflicts:
	controllers/keygen.py