Added .gitignore
Updated .gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
Merge branch 'contentprovider' of https://github.com/CGTech/NowManager
Merge branch 'widgetprovider' of https://github.com/CGTech/NowManager
Work In Progress on Home Screen widget
Merge pull request #18 from curioustechizen/widgetprovider

Widgetprovider merge