Merge

Finished Travis' DA and Commenting, Yaphets WMD, and Dennys Front end
edit