things
Merge branch 'master' of https://github.com/seanmccullough/Research-Blocks.git

Conflicts:
	test1.html

Signed-off-by: Sean McCullough <seanwmccullough@gmail.com>
i don't know what i'm doing
Set up with Parse and getting the Facebook dialog, but it won't connect to Facebook.