Merge dev with Team_Master

Everything on this commit with run on everyones machines. The GUI front end is in a state that is presentable for class on Wednesday, March 26th.