Changes throughout the week

Various changes. The app now works as requested for class