tryscanhouse manual merge

Author AssemblerManiac <amaniac-github@shredco.com>
Author date 2018-02-18 16:00:41
Author local date 2018-02-18 11:00:41 -0500
Committer AssemblerManiac <amaniac-github@shredco.com>
Committer date 2018-02-18 16:00:41
Committer local date 2018-02-18 11:00:41 -0500
Commit 701f3608421b8c4b9a8e8356359db4554854fd98
Tree 651dfb4f3f07a9d41b80cc2bbeaa17c5201b6d92
Parent 1833b14bb39f57dc2c88357406e0d9af1069d148
Parent feb1e68502e1c9b95129a5fabaafc09fef766285
tryscanhouse manual merge