using matt's HasbroTest parse account
reverting index temporarily
Merge branch 'master' of https://github.com/samfrons/Parse-user

Conflicts:
	index.html
upgrade parse to 1.2.9