Initial
Merge commit '83c25149ad00d381b6929d52de566a345335f06e' into Philipe

 explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/thomasorten/Instagram

Conflicts:
	Instagram.xcodeproj/project.xcworkspace/xcshareddata/Instagram.xccheckout