committing prior to merging with Elena's 2/3 changes (take 2)
Merge branch 'master' of https://github.com/lthrock/cs147_project
basic createEvent button layout finished