Merge branch 'master' into develop
11/30/2014-DG-Set up a lot of framework for the program and heavily commented
11/30/2014-DG-recommit
Merge branch 'develop'