Syncing with github. At Iteration C5.  Added more of an application layout and added some functional tests to the controller