Luke - settings alignment
Merge branch 'last' of https://github.com/sjradach/CS3141_Calendar into last
Luke - add/event window alignment
Luke - settings cancel button
Luke - settings stuff
Luke - settings changes