Added facebook functionality...hopefully...
.DS_Store bannished!
Merge branch 'master' of github.com:BrookeRibelin/MKTG-app

Conflicts:
	.DS_Store
	MKTG-app.xcodeproj/project.pbxproj
	MKTG-app/Base.lproj/Main.storyboard
Trying to merge changes.
Messed up again...
Merging more changes.
Edited the gitignore file.
Preparing to merge.
Adjusted the gitignore file.