Squashed commit of the following:
Squashed commit of the following:

commit 6c1679fbd933ad98d32e99a86522d1ab388dda4d
Author: Lawson Welborn <lawsonwelborn@gmail.com>
Date:   Wed May 18 12:35:53 2016 -0400

    test6

    test6

Crono30067/lawson-efolder,Crono30067/lawson-efolder