Syntax edits
Merge branch 'master' of https://github.com/mananshah99/wordscrambler

Conflicts:
	.DS_Store
	WordScrambler/ViewController.m