updating gitignore
Merge pull request #2 from bbhati/kushan

updating gitignore
changing some minor stuff
changing some minor stuff
Merge branch 'v2'
Merge remote-tracking branch 'origin/master' into kushan

Conflicts:
	Chef.meV2/Chef.meV2.xcodeproj/project.pbxproj
Adding some changes
more changes