stuff
stuff
Merge branch 'master' into anjali2

Conflicts:
	StupidDictionary/SDWordTableViewController.m
Merge branch 'anjali2'