Added Parse framework
merge attempt worked