# This is a combination of 2 commits.
# The first commit's message is:

 latest changes 8-4-14

# This is the 2nd commit message:

merge latest
squash
Merge branch 'squashed'

Conflicts:
	LivefyreReviews/LFRConfig.m