sd

Change-Id: I80685df4fae9b6ba3cff1213aef9a48fef241daf
asdfMerge branch 'master' of
ssh://git@github.com/dtyndall/CelebrationApp.git

Conflicts:
	CelebrationApp/src/com/example/celebrationapp/EventProfile.java

Change-Id: I2479247f7b2dcdcb9bbc49789aed6654acdd743c
Changed taskSchedule


Change-Id: I99411cf7c3c3d82dbaea42e8139aef2843b9cf0c