Merge branch 'master' of https://github.com/sarahwada/citris_mobile_app into sarah
added EventsPriorityQueue, untested
edited AddViewController to match xib, linked AddViewController methods to xib
Merge branch 'master' of https://github.com/sarahwada/citris_mobile_app into sarah
addPill button works
Merge branch 'master' of https://github.com/sarahwada/citris_mobile_app into sarah

Conflicts:
	MindYourPills/AddViewController.m
added endDate field, TODO: implement in front end
added field for comparator in EventsPriorityQueue
fixed merge conflicts
fixed merge comflicts
unfinished changes to displaying next hours worth of events on homepage tableview
Merge branch 'master' into sarah
updated Event object, added data structures for homepage sorting and viewing. not tested/working yet.
fixed Event object
Merge branch 'master' into sarah
kevin first commit
finished populating dict
event changed
added function getEventsInNextHour in Events.m, added some handling code in HompageViewController.m, fixed event object, fixed instances that called event object, added EventToDisplay
fixed merge conflicts