@dmcartor
dmcartor Merge branch 'master' of https://github.com/dmcartor/MDMR
458d979 Feb 13, 2018
Merge branch 'master' of https://github.com/dmcartor/MDMR 
# Conflicts:
#	DESCRIPTION
458d979