End of Spring 2015

Here is all the code as submitted by 4/22/2015.

Any commits after this tag will be future modifications or additions from work not quite finished.