Something
Merge branch 'master' into nick

Conflicts:
	README.md
Added Parse SDK