Adding local notification changes
reformatted home screen
Fixed some merge conflicts