Commit to allow switch between branches.

Signed-off-by: Stephen Carlson <stephen_carlson@byu.edu>
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	.gitignore